Handle lower-case 'env.Path' on Windows

npm · May 10, 2015 · ff956d8 · ff956d8
1 parent 9cbdf59
commit ff956d8
Showing 1 changed file with 28 additions and 2 deletions.
diff --git a/which.js b/which.js
@@ -27,9 +27,22 @@ function which (cmd, opt, cb) {
   }
 
   var colon = opt.colon || COLON
-  var pathEnv = (opt.path || process.env.PATH || '').split(colon)
+  var pathEnv = opt.path || process.env.PATH || ''
   var pathExt = ['']
 
+  // On windows, env.Path is common.
+  if (process.platform === 'win32' && !pathEnv) {
+    var k = Object.keys(process.env)
+    for (var p = 0; p < k.length; p++) {
+      if (p.toLowerCase() === 'path') {
+        pathEnv = process.env[p]
+        break
+      }
+    }
+  }
+
+  pathEnv = pathEnv.split(colon)
+
   if (process.platform === 'win32') {
     pathEnv.push(process.cwd())
     pathExt = opt.pathExt || (process.env.PATHEXT || '.EXE').split(colon)
@@ -66,9 +79,22 @@ function whichSync (cmd, opt) {
 
   var colon = opt.colon || COLON
 
-  var pathEnv = (opt.path || process.env.PATH || '').split(colon)
+  var pathEnv = opt.path || process.env.PATH || ''
   var pathExt = ['']
 
+  // On windows, env.Path is common.
+  if (process.platform === 'win32' && !pathEnv) {
+    var k = Object.keys(process.env)
+    for (var p = 0; p < k.length; p++) {
+      if (p.toLowerCase() === 'path') {
+        pathEnv = process.env[p]
+        break
+      }
+    }
+  }
+
+  pathEnv = pathEnv.split(colon)
+
   if (process.platform === 'win32') {
     pathEnv.push(process.cwd())
     pathExt = (opt.pathExt || process.env.PATHEXT || '.EXE').split(colon)