fix link regression, regarding new path getters

npm · Oct 25, 2011 · d526a67 · d526a67
1 parent b7d33af
commit d526a67
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/build.js b/lib/build.js
@@ -72,7 +72,7 @@ function linkStuff (pkg, folder, global, didRB, cb) {
   // then bins are in {prefix}/bin
   // otherwise, then bins are in folder/../.bin
   var parent = path.dirname(folder)
-    , gnm = global && npm.dir
+    , gnm = global && npm.globalDir
     , top = parent === npm.dir
     , gtop = parent === gnm
 
@@ -131,7 +131,7 @@ function linkBins (pkg, folder, parent, gtop, cb) {
   if (!pkg.bin || !gtop && path.basename(parent) !== "node_modules") {
     return cb()
   }
-  var binRoot = gtop ? npm.bin
+  var binRoot = gtop ? npm.globalBin
                      : path.resolve(parent, ".bin")
   log.verbose([pkg.bin, binRoot, gtop], "bins linking")
 

diff --git a/lib/link.js b/lib/link.js
@@ -58,8 +58,8 @@ function linkInstall (pkgs, cb) {
       next()
     }
 
-    var t = npm.globalDir
-      , pp = path.resolve(npm.dir, pkg)
+    var t = path.resolve(npm.globalDir, "..")
+      , pp = path.resolve(npm.globalDir, pkg)
       , rp = null
       , target = path.resolve(npm.dir, pkg)