fix: backport a fix from master branch

bazel-contrib · May 29, 2020 · 24cb37e · 24cb37e
1 parent c27d2a7
commit 24cb37e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/internal/node/node_patches.js b/internal/node/node_patches.js
@@ -593,7 +593,10 @@ fi
         process.env.PATH = nodeDir + path.delimiter + process.env.PATH;
     }
     // fix execPath so folks use the proxy node
-    process.argv[0] = process.execPath = path.join(nodeDir, 'node');
+    if (process.platform == 'win32') ;
+    else {
+        process.argv[0] = process.execPath = path.join(nodeDir, 'node');
+    }
     // replace any instances of require script in execArgv with the absolute path to the script.
     // example: bazel-require-script.js
     process.execArgv.map(v => {

diff --git a/packages/node-patches/src/subprocess.ts b/packages/node-patches/src/subprocess.ts
@@ -47,7 +47,11 @@ fi
   }
 
   // fix execPath so folks use the proxy node
-  process.argv[0] = process.execPath = path.join(nodeDir, 'node');
+  if (process.platform == 'win32') {
+    // FIXME: need to make an exe, or run in a shell so we can use .bat
+  } else {
+    process.argv[0] = process.execPath = path.join(nodeDir, 'node');
+  }
 
   // replace any instances of require script in execArgv with the absolute path to the script.
   // example: bazel-require-script.js