From 92e5cb9b0bd4d5cfdccd723defd4aafde81bb9d1 Mon Sep 17 00:00:00 2001
From: "Rico Sta. Cruz" <rstacruz@users.noreply.github.com>
Date: Sun, 31 Jan 2016 01:52:21 +0800
Subject: [PATCH] Fix binstubs for bundled dependencies

---
 lib/install.js                   | 4 ++--
 lib/install/link_bins.js         | 8 ++++----
 lib/install/link_bundled_deps.js | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/install.js b/lib/install.js
index 7981efbfae..f83e2743cc 100644
--- a/lib/install.js
+++ b/lib/install.js
@@ -187,8 +187,8 @@ function buildInStore (ctx, paths, pkg, log) {
     .then(_ => log('package.json', fulldata))
 
     // link node_modules/.bin
-    .then(_ => linkBins(paths.modules, paths.tmp, paths.target))
-    .then(_ => linkBundledDeps(paths.tmp))
+    .then(_ => linkBins(paths.modules, join(paths.tmp, '_'), join(paths.target, '_')))
+    .then(_ => linkBundledDeps(join(paths.tmp, '_')))
 
     // recurse down to dependencies
     .then(_ => log('dependencies'))
diff --git a/lib/install/link_bins.js b/lib/install/link_bins.js
index e3a14c0868..187bca1d97 100644
--- a/lib/install/link_bins.js
+++ b/lib/install/link_bins.js
@@ -20,7 +20,7 @@ var debug = require('debug')('pnpm:link_bins')
  */
 
 module.exports = function linkBins (modules, target, finalTarget) {
-  var pkg = tryRequire(join(target, '_', 'package.json'))
+  var pkg = tryRequire(join(target, 'package.json'))
   if (!pkg || !pkg.bin) return
 
   var bins = binify(pkg)
@@ -29,13 +29,13 @@ module.exports = function linkBins (modules, target, finalTarget) {
     var actualBin = bins[bin]
 
     return Promise.resolve()
-      .then(_ => fs.chmod(join(target, '_', actualBin), 0o755))
+      .then(_ => fs.chmod(join(target, actualBin), 0o755))
       .then(_ => mkdirp(join(modules, '.bin')))
       .then(_ => debug('linking %s -> %s',
-        join(finalTarget, '_', actualBin),
+        join(finalTarget, actualBin),
         join(modules, '.bin', bin)))
       .then(_ => relSymlink(
-        join(finalTarget, '_', actualBin),
+        join(finalTarget, actualBin),
         join(modules, '.bin', bin)))
   })
 }
diff --git a/lib/install/link_bundled_deps.js b/lib/install/link_bundled_deps.js
index e4ce89247e..0da01bb397 100644
--- a/lib/install/link_bundled_deps.js
+++ b/lib/install/link_bundled_deps.js
@@ -4,7 +4,7 @@ var join = require('path').join
 var linkBins = require('./link_bins')
 
 module.exports = function linkBundledDeps (root) {
-  var nodeModules = join(root, '_', 'node_modules')
+  var nodeModules = join(root, 'node_modules')
 
   return isDir(nodeModules, _ =>
     Promise.all(fs.readdir(nodeModules).map(mod =>