reverted Nested executables #1210 to fix #1823 (#1867)

yarnpkg · Nov 15, 2016 · 5a59acb · 5a59acb
1 parent 1b2f6b5
commit 5a59acb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/__tests__/commands/install.js b/__tests__/commands/install.js
@@ -521,7 +521,8 @@ test.concurrent(
   },
 );
 
-test.concurrent('install should hoist nested bin scripts', (): Promise<void> => {
+// disabled to resolve https://github.com/yarnpkg/yarn/pull/1210
+test.skip('install should hoist nested bin scripts', (): Promise<void> => {
   return runInstall({binLinks: true}, 'install-nested-bin', async (config) => {
     const binScripts = await fs.walk(path.join(config.cwd, 'node_modules', '.bin'));
     // need to double the amount as windows makes 2 entries for each dependency

diff --git a/src/package-linker.js b/src/package-linker.js
@@ -187,7 +187,7 @@ export default class PackageLinker {
     if (this.config.binLinks) {
       const tickBin = this.reporter.progress(flatTree.length);
       await promise.queue(flatTree, async ([dest, {pkg}]) => {
-        const binLoc = path.join(this.config.cwd, this.config.getFolder(pkg));
+        const binLoc = path.join(dest, this.config.getFolder(pkg));
         await this.linkBinDependencies(pkg, binLoc);
         tickBin(dest);
       }, 4);