Enforce using the right bash.exe on Windows

zeek · Jan 13, 2025 · f01fdfa · f01fdfa
1 parent 9ab2c72
commit f01fdfa
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/btest b/btest
@@ -228,7 +228,10 @@ def _build_win_subprocess_cmd_script(cmd, tmpdir=None):
     tf.write(fcontents)
     tf.flush()
 
-    bash_cmd = ["bash.exe", "-c", normalize_path(tf.name)]
+    # If you have Windows 11 and WSL2, it defaults to calling "Microsoft Bash Launcher"
+    # even if gitbash is in your path first. Who knows why. Using shutil.which here
+    # forces it to call the right thing.
+    bash_cmd = [shutil.which("bash.exe"), "-c", normalize_path(tf.name)]
     return tf, bash_cmd