Resolve realpaths for targetBinLoc and pkgLoc in linkSelfDependencies

yarnpkg · Jul 5, 2016 · d8059ad · d8059ad
1 parent def4e54
commit d8059ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/package-linker.js b/src/package-linker.js
@@ -40,6 +40,8 @@ export default class PackageLinker {
   config: Config;
 
   async linkSelfDependencies(pkg: Manifest, pkgLoc: string, targetBinLoc: string): Promise<void> {
+    targetBinLoc = await fs.realpath(targetBinLoc);
+    pkgLoc = await fs.realpath(pkgLoc);
     for (let [scriptName, scriptCmd] of entries(pkg.bin)) {
       let dest = path.join(targetBinLoc, scriptName);
       let src  = path.join(pkgLoc, scriptCmd);

diff --git a/src/util/fs.js b/src/util/fs.js
@@ -153,11 +153,7 @@ export async function symlink(src: string, dest: string): Promise<void> {
       await fsSymlink(src, dest, "junction");
     } else {
       // use relative paths otherwise which will be retained if the directory is moved
-      let relative = src;
-      if (path.isAbsolute(relative)) {
-        relative = path.relative(path.dirname(dest), src);
-      }
-
+      let relative = path.relative(path.dirname(dest), src);
       await fsSymlink(relative, dest);
     }
   } catch (err) {