diff --git a/.ci/build.sh b/.ci/build.sh index e9f9075a4..6e0257876 100644 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -222,6 +222,7 @@ then echo -n [-] Downloading dependencies: pkg_dir="/var/cache/pacman/pkg" repo_base="https://repo.msys2.org/mingw/$(echo $MSYSTEM | tr '[:upper:]' '[:lower:]')" + cat .ci/dependencies_msys.txt | tr -d '\r' > deps.txt pkgs="" while IFS=" " read pkg version do @@ -269,7 +270,7 @@ then fi echo -n "]" fi - done < <(cat .ci/dependencies_msys.txt | tr -d '\r') + done < deps.txt [ -z "$pkgs" ] && echo -n none required echo @@ -299,8 +300,8 @@ then do prefixed_pkg="$MINGW_PACKAGE_PREFIX-$pkg" grep -qE "^$prefixed_pkg " pacman.txt || pkgs="$pkgs $prefixed_pkg" - done < <(cat .ci/dependencies_msys.txt | tr -d '\r') - rm -f pacman.txt + done < deps.txt + rm -f pacman.txt deps.txt yes | pacman -S --needed $pkgs if [ $? -ne 0 ] then diff --git a/.gitignore b/.gitignore index 85bbd51d8..a38da5deb 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ Makefile /archive_tmp /static2dll.* /pacman.txt +/deps.txt /VERSION *.zip *.tar