80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Jenkins: Fix build script sh compatibility

Browse Source
This commit is contained in:
RichardG867
2022-03-15 21:23:51 -03:00
parent 94be8cdfc6
commit fa795f0f50
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.ci/build.sh
View File

@@ -222,6 +222,7 @@ then
echo -n [-] Downloading dependencies: echo -n [-] Downloading dependencies:
pkg_dir="/var/cache/pacman/pkg" pkg_dir="/var/cache/pacman/pkg"
repo_base="https://repo.msys2.org/mingw/$(echo $MSYSTEM | tr '[:upper:]' '[:lower:]')" repo_base="https://repo.msys2.org/mingw/$(echo $MSYSTEM | tr '[:upper:]' '[:lower:]')"
cat .ci/dependencies_msys.txt | tr -d '\r' > deps.txt
pkgs="" pkgs=""
while IFS=" " read pkg version while IFS=" " read pkg version
do do
@@ -269,7 +270,7 @@ then
fi fi
echo -n "]" echo -n "]"
fi fi
done < <(cat .ci/dependencies_msys.txt | tr -d '\r') done < deps.txt
[ -z "$pkgs" ] && echo -n none required [ -z "$pkgs" ] && echo -n none required
echo echo
@@ -299,8 +300,8 @@ then
do do
prefixed_pkg="$MINGW_PACKAGE_PREFIX-$pkg" prefixed_pkg="$MINGW_PACKAGE_PREFIX-$pkg"
grep -qE "^$prefixed_pkg " pacman.txt || pkgs="$pkgs $prefixed_pkg" grep -qE "^$prefixed_pkg " pacman.txt || pkgs="$pkgs $prefixed_pkg"
done < <(cat .ci/dependencies_msys.txt | tr -d '\r') done < deps.txt
rm -f pacman.txt rm -f pacman.txt deps.txt
yes | pacman -S --needed $pkgs yes | pacman -S --needed $pkgs
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then

1
.gitignore vendored
View File

@@ -28,6 +28,7 @@ Makefile
/archive_tmp /archive_tmp
/static2dll.* /static2dll.*
/pacman.txt /pacman.txt
/deps.txt
/VERSION /VERSION
*.zip *.zip
*.tar *.tar