Simplifying environmental variable handling.

dthree · Feb 28, 2016 · 61f31a1 · 61f31a1
1 parent 012e4d5
commit 61f31a1
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 229 deletions.
diff --git a/dist/preparser.js b/dist/preparser.js
@@ -1,30 +1,14 @@
 'use strict';
 
-var os = require('os');
-var windows = os.platform() === 'win32';
-
 // Replace out env variables.
+
 var parseEnvVariables = function parseEnvVariables(input) {
   var referenceRegex = /\${([a-zA-Z_][a-zA-Z0-9_]*)}|\$([a-zA-Z_][a-zA-Z0-9_]*)/g;
 
   return input.replace(referenceRegex, function (varRef, capture1, capture2, capture3) {
     var varName = capture1 || capture2 || capture3;
-    var value = '';
-    if (windows) {
-      for (var name in process.env) {
-        if (process.env.hasOwnProperty(name)) {
-          // Windows is case insensitive
-          if (String(name).toLowerCase() === varName.toLowerCase()) {
-            value = process.env[name];
-            break;
-          }
-        }
-      }
-    } else {
-      // default to empty string on Unix
-      value = process.env.hasOwnProperty(varName) ? process.env[varName] : '';
-    }
-    return value;
+    // Return the value of the variable, or the empty string if not there
+    return process.env.hasOwnProperty(varName) ? process.env[varName] : '';
   });
 };
 

diff --git a/packages/cat/dist/preparser.js b/packages/cat/dist/preparser.js
@@ -1,30 +1,14 @@
 'use strict';
 
-var os = require('os');
-var windows = os.platform() === 'win32';
-
 // Replace out env variables.
+
 var parseEnvVariables = function parseEnvVariables(input) {
   var referenceRegex = /\${([a-zA-Z_][a-zA-Z0-9_]*)}|\$([a-zA-Z_][a-zA-Z0-9_]*)/g;
 
   return input.replace(referenceRegex, function (varRef, capture1, capture2, capture3) {
     var varName = capture1 || capture2 || capture3;
-    var value = '';
-    if (windows) {
-      for (var name in process.env) {
-        if (process.env.hasOwnProperty(name)) {
-          // Windows is case insensitive
-          if (String(name).toLowerCase() === varName.toLowerCase()) {
-            value = process.env[name];
-            break;
-          }
-        }
-      }
-    } else {
-      // default to empty string on Unix
-      value = process.env.hasOwnProperty(varName) ? process.env[varName] : '';
-    }
-    return value;
+    // Return the value of the variable, or the empty string if not there
+    return process.env.hasOwnProperty(varName) ? process.env[varName] : '';
   });
 };
 

diff --git a/packages/cp/dist/preparser.js b/packages/cp/dist/preparser.js
@@ -1,30 +1,14 @@
 'use strict';
 
-var os = require('os');
-var windows = os.platform() === 'win32';
-
 // Replace out env variables.
+
 var parseEnvVariables = function parseEnvVariables(input) {
   var referenceRegex = /\${([a-zA-Z_][a-zA-Z0-9_]*)}|\$([a-zA-Z_][a-zA-Z0-9_]*)/g;
 
   return input.replace(referenceRegex, function (varRef, capture1, capture2, capture3) {
     var varName = capture1 || capture2 || capture3;
-    var value = '';
-    if (windows) {
-      for (var name in process.env) {
-        if (process.env.hasOwnProperty(name)) {
-          // Windows is case insensitive
-          if (String(name).toLowerCase() === varName.toLowerCase()) {
-            value = process.env[name];
-            break;
-          }
-        }
-      }
-    } else {
-      // default to empty string on Unix
-      value = process.env.hasOwnProperty(varName) ? process.env[varName] : '';
-    }
-    return value;
+    // Return the value of the variable, or the empty string if not there
+    return process.env.hasOwnProperty(varName) ? process.env[varName] : '';
   });
 };
 

diff --git a/packages/kill/dist/preparser.js b/packages/kill/dist/preparser.js
@@ -1,30 +1,14 @@
 'use strict';
 
-var os = require('os');
-var windows = os.platform() === 'win32';
-
 // Replace out env variables.
+
 var parseEnvVariables = function parseEnvVariables(input) {
   var referenceRegex = /\${([a-zA-Z_][a-zA-Z0-9_]*)}|\$([a-zA-Z_][a-zA-Z0-9_]*)/g;
 
   return input.replace(referenceRegex, function (varRef, capture1, capture2, capture3) {
     var varName = capture1 || capture2 || capture3;
-    var value = '';
-    if (windows) {
-      for (var name in process.env) {
-        if (process.env.hasOwnProperty(name)) {
-          // Windows is case insensitive
-          if (String(name).toLowerCase() === varName.toLowerCase()) {
-            value = process.env[name];
-            break;
-          }
-        }
-      }
-    } else {
-      // default to empty string on Unix
-      value = process.env.hasOwnProperty(varName) ? process.env[varName] : '';
-    }
-    return value;
+    // Return the value of the variable, or the empty string if not there
+    return process.env.hasOwnProperty(varName) ? process.env[varName] : '';
   });
 };
 

diff --git a/packages/ls/dist/preparser.js b/packages/ls/dist/preparser.js
@@ -1,30 +1,14 @@
 'use strict';
 
-var os = require('os');
-var windows = os.platform() === 'win32';
-
 // Replace out env variables.
+
 var parseEnvVariables = function parseEnvVariables(input) {
   var referenceRegex = /\${([a-zA-Z_][a-zA-Z0-9_]*)}|\$([a-zA-Z_][a-zA-Z0-9_]*)/g;
 
   return input.replace(referenceRegex, function (varRef, capture1, capture2, capture3) {
     var varName = capture1 || capture2 || capture3;
-    var value = '';
-    if (windows) {
-      for (var name in process.env) {
-        if (process.env.hasOwnProperty(name)) {
-          // Windows is case insensitive
-          if (String(name).toLowerCase() === varName.toLowerCase()) {
-            value = process.env[name];
-            break;
-          }
-        }
-      }
-    } else {
-      // default to empty string on Unix
-      value = process.env.hasOwnProperty(varName) ? process.env[varName] : '';
-    }
-    return value;
+    // Return the value of the variable, or the empty string if not there
+    return process.env.hasOwnProperty(varName) ? process.env[varName] : '';
   });
 };
 

diff --git a/packages/mkdir/dist/preparser.js b/packages/mkdir/dist/preparser.js
@@ -1,30 +1,14 @@
 'use strict';
 
-var os = require('os');
-var windows = os.platform() === 'win32';
-
 // Replace out env variables.
+
 var parseEnvVariables = function parseEnvVariables(input) {
   var referenceRegex = /\${([a-zA-Z_][a-zA-Z0-9_]*)}|\$([a-zA-Z_][a-zA-Z0-9_]*)/g;
 
   return input.replace(referenceRegex, function (varRef, capture1, capture2, capture3) {
     var varName = capture1 || capture2 || capture3;
-    var value = '';
-    if (windows) {
-      for (var name in process.env) {
-        if (process.env.hasOwnProperty(name)) {
-          // Windows is case insensitive
-          if (String(name).toLowerCase() === varName.toLowerCase()) {
-            value = process.env[name];
-            break;
-          }
-        }
-      }
-    } else {
-      // default to empty string on Unix
-      value = process.env.hasOwnProperty(varName) ? process.env[varName] : '';
-    }
-    return value;
+    // Return the value of the variable, or the empty string if not there
+    return process.env.hasOwnProperty(varName) ? process.env[varName] : '';
   });
 };
 

diff --git a/packages/mv/dist/preparser.js b/packages/mv/dist/preparser.js
@@ -1,30 +1,14 @@
 'use strict';
 
-var os = require('os');
-var windows = os.platform() === 'win32';
-
 // Replace out env variables.
+
 var parseEnvVariables = function parseEnvVariables(input) {
   var referenceRegex = /\${([a-zA-Z_][a-zA-Z0-9_]*)}|\$([a-zA-Z_][a-zA-Z0-9_]*)/g;
 
   return input.replace(referenceRegex, function (varRef, capture1, capture2, capture3) {
     var varName = capture1 || capture2 || capture3;
-    var value = '';
-    if (windows) {
-      for (var name in process.env) {
-        if (process.env.hasOwnProperty(name)) {
-          // Windows is case insensitive
-          if (String(name).toLowerCase() === varName.toLowerCase()) {
-            value = process.env[name];
-            break;
-          }
-        }
-      }
-    } else {
-      // default to empty string on Unix
-      value = process.env.hasOwnProperty(varName) ? process.env[varName] : '';
-    }
-    return value;
+    // Return the value of the variable, or the empty string if not there
+    return process.env.hasOwnProperty(varName) ? process.env[varName] : '';
   });
 };
 

diff --git a/packages/pwd/dist/preparser.js b/packages/pwd/dist/preparser.js
@@ -1,30 +1,14 @@
 'use strict';
 
-var os = require('os');
-var windows = os.platform() === 'win32';
-
 // Replace out env variables.
+
 var parseEnvVariables = function parseEnvVariables(input) {
   var referenceRegex = /\${([a-zA-Z_][a-zA-Z0-9_]*)}|\$([a-zA-Z_][a-zA-Z0-9_]*)/g;
 
   return input.replace(referenceRegex, function (varRef, capture1, capture2, capture3) {
     var varName = capture1 || capture2 || capture3;
-    var value = '';
-    if (windows) {
-      for (var name in process.env) {
-        if (process.env.hasOwnProperty(name)) {
-          // Windows is case insensitive
-          if (String(name).toLowerCase() === varName.toLowerCase()) {
-            value = process.env[name];
-            break;
-          }
-        }
-      }
-    } else {
-      // default to empty string on Unix
-      value = process.env.hasOwnProperty(varName) ? process.env[varName] : '';
-    }
-    return value;
+    // Return the value of the variable, or the empty string if not there
+    return process.env.hasOwnProperty(varName) ? process.env[varName] : '';
   });
 };
 

diff --git a/packages/rm/dist/preparser.js b/packages/rm/dist/preparser.js
@@ -1,30 +1,14 @@
 'use strict';
 
-var os = require('os');
-var windows = os.platform() === 'win32';
-
 // Replace out env variables.
+
 var parseEnvVariables = function parseEnvVariables(input) {
   var referenceRegex = /\${([a-zA-Z_][a-zA-Z0-9_]*)}|\$([a-zA-Z_][a-zA-Z0-9_]*)/g;
 
   return input.replace(referenceRegex, function (varRef, capture1, capture2, capture3) {
     var varName = capture1 || capture2 || capture3;
-    var value = '';
-    if (windows) {
-      for (var name in process.env) {
-        if (process.env.hasOwnProperty(name)) {
-          // Windows is case insensitive
-          if (String(name).toLowerCase() === varName.toLowerCase()) {
-            value = process.env[name];
-            break;
-          }
-        }
-      }
-    } else {
-      // default to empty string on Unix
-      value = process.env.hasOwnProperty(varName) ? process.env[varName] : '';
-    }
-    return value;
+    // Return the value of the variable, or the empty string if not there
+    return process.env.hasOwnProperty(varName) ? process.env[varName] : '';
   });
 };
 

diff --git a/packages/sort/dist/preparser.js b/packages/sort/dist/preparser.js
@@ -1,30 +1,14 @@
 'use strict';
 
-var os = require('os');
-var windows = os.platform() === 'win32';
-
 // Replace out env variables.
+
 var parseEnvVariables = function parseEnvVariables(input) {
   var referenceRegex = /\${([a-zA-Z_][a-zA-Z0-9_]*)}|\$([a-zA-Z_][a-zA-Z0-9_]*)/g;
 
   return input.replace(referenceRegex, function (varRef, capture1, capture2, capture3) {
     var varName = capture1 || capture2 || capture3;
-    var value = '';
-    if (windows) {
-      for (var name in process.env) {
-        if (process.env.hasOwnProperty(name)) {
-          // Windows is case insensitive
-          if (String(name).toLowerCase() === varName.toLowerCase()) {
-            value = process.env[name];
-            break;
-          }
-        }
-      }
-    } else {
-      // default to empty string on Unix
-      value = process.env.hasOwnProperty(varName) ? process.env[varName] : '';
-    }
-    return value;
+    // Return the value of the variable, or the empty string if not there
+    return process.env.hasOwnProperty(varName) ? process.env[varName] : '';
   });
 };
 

diff --git a/packages/touch/dist/preparser.js b/packages/touch/dist/preparser.js
@@ -1,30 +1,14 @@
 'use strict';
 
-var os = require('os');
-var windows = os.platform() === 'win32';
-
 // Replace out env variables.
+
 var parseEnvVariables = function parseEnvVariables(input) {
   var referenceRegex = /\${([a-zA-Z_][a-zA-Z0-9_]*)}|\$([a-zA-Z_][a-zA-Z0-9_]*)/g;
 
   return input.replace(referenceRegex, function (varRef, capture1, capture2, capture3) {
     var varName = capture1 || capture2 || capture3;
-    var value = '';
-    if (windows) {
-      for (var name in process.env) {
-        if (process.env.hasOwnProperty(name)) {
-          // Windows is case insensitive
-          if (String(name).toLowerCase() === varName.toLowerCase()) {
-            value = process.env[name];
-            break;
-          }
-        }
-      }
-    } else {
-      // default to empty string on Unix
-      value = process.env.hasOwnProperty(varName) ? process.env[varName] : '';
-    }
-    return value;
+    // Return the value of the variable, or the empty string if not there
+    return process.env.hasOwnProperty(varName) ? process.env[varName] : '';
   });
 };