Merge branch 'master' of github.com:facebook/fbkpm

Author: sebmck

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fbkpm",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "license": "BSD-3-Clause",
   "preferGlobal": true,
   "main": "./index.js",

src/cli/index.js

@@ -33,7 +33,8 @@ commander.usage("[command] [flags]");
 commander.option("--json", "");
 commander.option("--modules-folder [path]", "rather than installing modules into the node_modules " +
                                             "folder relative to the cwd, output them here");
-
+commander.option("--packages-root [path]", "rather than storing modules into a global packages root," +
+                                           "store them here");
 // get command name
 let commandName = args.splice(2, 1)[0] || "";
 
@@ -77,7 +78,8 @@ reporter.initPeakMemoryCounter();
 
 //
 let config = new Config(reporter, {
-  modulesFolder: commander.modulesFolder
+  modulesFolder: commander.modulesFolder,
+  packagesRoot: commander.packagesRoot,
 });
 
 // print header

src/config.js

@@ -90,7 +90,9 @@ export default class Config {
       this.cwd = opts.cwd;
     }
 
-    this.packagesRoot = await this.getPackageRoot(opts);
+    if (!this.packagesRoot) {
+      this.packagesRoot = await this.getPackageRoot(opts);
+    }
 
     if (!this.tempFolder) {
       this.tempFolder = await this.getTempFolder();

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

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