Fix binstubs for bundled dependencies

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'))

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)))
   })
 }

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 =>