Explicitly inject builtinconfig into any npm install

2 files changed, 18 insertions, 16 deletions

diff --git a/lib/build.js b/lib/build.js
index c3a469633..73050454c 100644
--- a/lib/build.js
+++ b/lib/build.js
@@ -61,11 +61,10 @@ function build_ (global, didPre, didRB) { return function (folder, cb) {
 }}
 
 function writeBuiltinConf (folder, cb) {
-  // if overwriting *this* instance of npm, then write the default conf,
-  // because otherwise we just lost overwrote the current folder.
-  if (folder !== path.resolve(__dirname, "..")) return cb()
+  // the builtin config is "sticky". Any time npm installs itself,
+  // it puts its builtin config file there, as well.
   var ini = require("./utils/ini.js")
-  ini.save("builtin", cb)
+  ini.saveConfig("builtin", path.resolve(folder, "npmrc"), cb)
 }
 
 function linkStuff (pkg, folder, global, didRB, cb) {
diff --git a/lib/utils/ini.js b/lib/utils/ini.js
index 342e1271c..95fa5a5cc 100644
--- a/lib/utils/ini.js
+++ b/lib/utils/ini.js
@@ -19,6 +19,7 @@
 
 exports.resolveConfigs = resolveConfigs
 exports.save = save
+exports.saveConfig = saveConfig
 exports.del = del
 exports.get = get
 exports.set = set
@@ -239,18 +240,20 @@ function save (which, cb) {
   })
 }
 
-function saveConfig (which, cb) {
-  var file
-  switch (which) {
-    case "builtin":
-      file = path.resolve(__dirname, "../../npmrc")
-      break
-    case "global":
-      file = configList.get("globalconfig")
-      break
-    default:
-      file = configList.get("userconfig")
-      which = "user"
+function saveConfig (which, file, cb) {
+  if (typeof file === "function") cb = file, file = null
+  if (!file) {
+    switch (which) {
+      case "builtin":
+        file = path.resolve(__dirname, "../../npmrc")
+        break
+      case "global":
+        file = configList.get("globalconfig")
+        break
+      default:
+        file = configList.get("userconfig")
+        which = "user"
+    }
   }
 
   saveConfigfile