diff --git a/tools/ci-install.sh b/tools/ci-install.sh index 362ed05c..ac0ae95d 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -195,6 +195,8 @@ if [ "$ci_local_packages" = yes ]; then (*-w64-mingw32) mirror=https://repo.msys2.org/mingw/${ci_host%%-*} dep_prefix=$(pwd)/${ci_host}-prefix + # clean install dir, if present + rm -rf ${dep_prefix} install -d "${dep_prefix}" wget -O files.lst ${mirror} sed 's,^.*$,,g' files.lst | grep -v "\.db" | grep -v "\.files" | grep ".*zst$" | sort > filenames.lst @@ -217,6 +219,11 @@ if [ "$ci_local_packages" = yes ]; then echo "could not find filename for package '${pkg}'" exit 1 fi + # Remove previously downloaded file, which can happen + # when run locally + if [ -f ${filename} ]; then + rm -rf ${filename} + fi wget ${mirror}/${filename} tar -C ${dep_prefix} --strip-components=1 -xvf ${filename} done