Support ${ENV} values in configs

2 files changed, 19 insertions, 3 deletions

diff --git a/lib/utils/config-defs.js b/lib/utils/config-defs.js
index 298b7cc54..c0ed1fca8 100644
--- a/lib/utils/config-defs.js
+++ b/lib/utils/config-defs.js
@@ -71,7 +71,10 @@ var temp = process.env.TMPDIR
 
 var home = ( process.platform === "win32"
            ? process.env.USERPROFILE
-           : process.env.HOME ) || temp
+           : process.env.HOME )
+
+if (home) process.env.HOME = home
+else home = temp
 
 var globalPrefix
 Object.defineProperty(exports, "defaults", {get: function () {
diff --git a/lib/utils/ini.js b/lib/utils/ini.js
index 81a937601..85aa28d23 100644
--- a/lib/utils/ini.js
+++ b/lib/utils/ini.js
@@ -199,12 +199,14 @@ function parseField (f, k, emptyIsFalse) {
     case "null": return null
     case "undefined": return undefined
   }
+
   if (isPath) {
     if (f.substr(0, 2) === "~/" && process.env.HOME) {
       f = path.resolve(process.env.HOME, f.substr(2))
     }
     f = path.resolve(f)
   }
+
   return f
 }
 
@@ -327,10 +329,21 @@ function snapshot (which) {
 }
 function get (key, which) {
   return (!key) ? snapshot(which)
-       : (!which) ? configList.get(key) // resolved
-       : configList.list[TRANS[which]] ? configList.list[TRANS[which]][key]
+       : (!which) ? envReplace(configList.get(key)) // resolved
+       : configList.list[TRANS[which]]
+         ? envReplace(configList.list[TRANS[which]][key])
        : undefined
 }
+
+function envReplace (f) {
+  if (typeof f !== "string" || !f) return f
+
+  // replace any ${ENV} values with the appropriate environ.
+  return f.replace(/\$\{([^}]+)\}/g, function (orig, name, i, s) {
+    return process.env[name] || orig
+  })
+}
+
 function del (key, which) {
   if (!which) configList.list.forEach(function (l) {
     delete l[key]