From c4d69fe95eaec1607265893434a29ff6d528924b Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 29 Mar 2022 09:59:59 +0200 Subject: [PATCH] tools/ci-install.sh: clean up the previously used installation prefix and the downloaded mingw packages This is necessary to have a clean initial state when running the script locally. Signed-off-by: Ralf Habacker --- tools/ci-install.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/ci-install.sh b/tools/ci-install.sh index 989b53132..bc1f72e45 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -194,6 +194,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 @@ -216,6 +218,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 -- 2.47.3