From 1701d9f1a69bff2ba074aa314a181f5b019ad0f1 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 10 Nov 2020 23:35:16 +0100 Subject: [PATCH] tools/ci-install.sh: Use package=() style for local package list to avoid '\' notation (cherry picked from commit 6412ccdf67b8440916a6a0f8b9b1741aa988192f) --- tools/ci-install.sh | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/tools/ci-install.sh b/tools/ci-install.sh index 6ee6251..d66eabe 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -241,19 +241,20 @@ if [ "$ci_local_packages" = yes ]; then mirror=http://repo.msys2.org/mingw/${ci_host%%-*} dep_prefix=$(pwd)/${ci_host}-prefix install -d "${dep_prefix}" - for pkg in \ - bzip2-1.0.8-1 \ - expat-2.2.9-1 \ - gcc-libs-9.3.0-2 \ - gettext-0.19.8.1-8 \ - glib2-2.64.2-1 \ - iconv-1.16-1 \ - libffi-3.3-1 \ - libiconv-1.16-1 \ - libwinpthread-git-8.0.0.5814.9dbf4cc1-1 \ - pcre-8.44-1 \ - zlib-1.2.11-7 \ - ; do + packages=( + bzip2-1.0.8-1 + expat-2.2.9-1 + gcc-libs-9.3.0-2 + gettext-0.19.8.1-8 + glib2-2.64.2-1 + iconv-1.16-1 + libffi-3.3-1 + libiconv-1.16-1 + libwinpthread-git-8.0.0.5814.9dbf4cc1-1 + pcre-8.44-1 + zlib-1.2.11-7 + ) + for pkg in "${packages[@]}" ; do wget ${mirror}/mingw-w64-${ci_host%%-*}-${pkg}-any.pkg.tar.xz tar -C ${dep_prefix} --strip-components=1 -xvf mingw-w64-${ci_host%%-*}-${pkg}-any.pkg.tar.xz done -- 2.7.4