Close #1598 Don't set global path until after figuring out node location

npm · Oct 25, 2011 · d000a57 · d000a57
1 parent 2ad3917
commit d000a57
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/lib/utils/config-defs.js b/lib/utils/config-defs.js
@@ -74,23 +74,24 @@ var home = ( process.platform === "win32"
            : process.env.HOME ) || temp
 
 var globalPrefix
-if (process.env.PREFIX) {
-  globalPrefix = process.env.PREFIX
-} else if (process.platform === "win32") {
-  // c:\node\node.exe --> prefix=c:\node\
-  globalPrefix = path.join(process.execPath, "..")
-} else {
-  // /usr/local/bin/node --> prefix=/usr/local
-  globalPrefix = path.join(process.execPath, "..", "..")
+Object.defineProperty(exports, "defaults", {get: function () {
+  if (defaults) return defaults
 
-  // destdir only is respected on Unix
-  if (process.env.DESTDIR) {
-    globalPrefix = process.env.DESTDIR + "/" + globalPrefix
+  if (process.env.PREFIX) {
+    globalPrefix = process.env.PREFIX
+  } else if (process.platform === "win32") {
+    // c:\node\node.exe --> prefix=c:\node\
+    globalPrefix = path.join(process.execPath, "..")
+  } else {
+    // /usr/local/bin/node --> prefix=/usr/local
+    globalPrefix = path.join(process.execPath, "..", "..")
+
+    // destdir only is respected on Unix
+    if (process.env.DESTDIR) {
+      globalPrefix = process.env.DESTDIR + "/" + globalPrefix
+    }
   }
-}
 
-Object.defineProperty(exports, "defaults", {get: function () {
-  if (defaults) return defaults
   return defaults =
     { "always-auth" : false