Run configure script with msys64 bash.

kiwix · Nov 23, 2023 · 08fba39 · 08fba39
1 parent 2d72f83
commit 08fba39
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/kiwixbuild/dependencies/base.py b/kiwixbuild/dependencies/base.py
@@ -418,7 +418,7 @@ def _configure(self, context):
         ]
         env = self.get_env(cross_comp_flags=True, cross_compilers=True, cross_path=True)
         self.set_configure_env(env)
-        run_command(command, self.build_path, context, env=env, shell=True)
+        run_command(command, self.build_path, context, env=env, shell="C:\\msys64\\usr\\bin\\bash.exe")
 
     def _compile(self, context):
         context.try_skip(self.build_path)

diff --git a/kiwixbuild/utils.py b/kiwixbuild/utils.py
@@ -297,8 +297,12 @@ def run_command(command, cwd, context, *, env=None, input=None, shell=False):
         kwargs = dict()
         if input:
             kwargs['stdin'] = subprocess.PIPE
+        if shell:
+            kwargs['shell'] = True
+            if isinstance(shell, str):
+                kwargs['executable'] = shell
         print("Command is", command)
-        process = subprocess.Popen(command, cwd=cwd, env=env, stdout=log or sys.stdout, stderr=subprocess.STDOUT, shell=shell, **kwargs)
+        process = subprocess.Popen(command, cwd=cwd, env=env, stdout=log or sys.stdout, stderr=subprocess.STDOUT, **kwargs)
         if input:
             input = input.encode()
         while True: