smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cp bash stuff in dir without space

This commit is contained in:
Matthieu Gautier 2024-05-08 11:43:26 +02:00
parent a90cf3d0a6
commit 4c23ac3c02
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -20,7 +20,11 @@ jobs:
- name: List info - name: List info
shell: bash shell: bash
run: | run: |
echo "$SHELL"
echo "***************************** C:\\Program Files\\Git\\bin" 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 ls C:/'Program Files'/Git/bin
echo "***************************** " echo "***************************** "
ls C:/'Program Files'/Git/usr/bin ls C:/'Program Files'/Git/usr/bin

11
kiwixbuild/configs/winbash.py
View File

@ -2,6 +2,7 @@ from .base import ConfigInfo
import sysconfig import sysconfig
from kiwixbuild._global import get_target_step from kiwixbuild._global import get_target_step
from pathlib import Path
class WinBashConfigInfo(ConfigInfo): class WinBashConfigInfo(ConfigInfo):
@ -20,8 +21,10 @@ class WinBashConfigInfo(ConfigInfo):
@property @property
def configure_wrapper(self): def configure_wrapper(self):
# yield "C:\\msys64\\usr\\bin\\bash.exe" # yield "C:\\msys64\\usr\\bin\\bash.iexe"
yield "C:\\msys64\\usr\\bin\\bash.exe" yield str(Path.home() / "bin" / "bash.exe")
# yield "C:\\msys64\\usr\\bin\\bash.exe"
@property @property
def make_wrapper(self): def make_wrapper(self):
@ -57,6 +60,6 @@ class WinBashConfigInfo(ConfigInfo):
# ) # )
# env["PATH"][:] = list(PATH_ENV) # env["PATH"][:] = list(PATH_ENV)
# env["PATH"] += ["C:\\msys64\\usr\\bin"] # env["PATH"] += ["C:\\msys64\\usr\\bin"]
env["SHELL"] = "C:\\msys64\\usr\\bin\\bash.exe" # env["SHELL"] = "C:\\msys64\\usr\\bin\\bash.exe"
env["CONFIG_SHELL"] = "C:\\msys64\\usr\\bin\\bash.exe" # env["CONFIG_SHELL"] = "C:\\msys64\\usr\\bin\\bash.exe"
return env return env