diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7ae548..252da49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,11 @@ jobs: - name: List info shell: bash run: | + echo "$SHELL" echo "***************************** C:\\Program Files\\Git\\bin" + mkdir $HOME/usr + cp -a C:/'Program Files'/Git/usr/bin $HOME/usr + cp -a C:/'Program Files'/Git/bin $HOME ls C:/'Program Files'/Git/bin echo "***************************** " ls C:/'Program Files'/Git/usr/bin diff --git a/kiwixbuild/configs/winbash.py b/kiwixbuild/configs/winbash.py index 27a1f69..3294413 100644 --- a/kiwixbuild/configs/winbash.py +++ b/kiwixbuild/configs/winbash.py @@ -2,6 +2,7 @@ from .base import ConfigInfo import sysconfig from kiwixbuild._global import get_target_step +from pathlib import Path class WinBashConfigInfo(ConfigInfo): @@ -20,8 +21,10 @@ class WinBashConfigInfo(ConfigInfo): @property def configure_wrapper(self): - # yield "C:\\msys64\\usr\\bin\\bash.exe" - yield "C:\\msys64\\usr\\bin\\bash.exe" + # yield "C:\\msys64\\usr\\bin\\bash.iexe" + yield str(Path.home() / "bin" / "bash.exe") + + # yield "C:\\msys64\\usr\\bin\\bash.exe" @property def make_wrapper(self): @@ -57,6 +60,6 @@ class WinBashConfigInfo(ConfigInfo): # ) # env["PATH"][:] = list(PATH_ENV) # env["PATH"] += ["C:\\msys64\\usr\\bin"] - env["SHELL"] = "C:\\msys64\\usr\\bin\\bash.exe" - env["CONFIG_SHELL"] = "C:\\msys64\\usr\\bin\\bash.exe" + # env["SHELL"] = "C:\\msys64\\usr\\bin\\bash.exe" + # env["CONFIG_SHELL"] = "C:\\msys64\\usr\\bin\\bash.exe" return env