msys2installdeps.sh - Fix broken for loops (thanks for noticing jazzynico!) and avoid repeatedly synchronizing package databases

(bzr r15577)

1 files changed, 9 insertions, 6 deletions

diff --git a/msys2installdeps.sh b/msys2installdeps.sh
index da3751971..a77ea6d8a 100755
--- a/msys2installdeps.sh
+++ b/msys2installdeps.sh
@@ -15,8 +15,11 @@
 #ARCH=mingw-w64-x86_64
 ARCH={mingw-w64-i686,mingw-w64-x86_64}
 
+# sync package databases
+pacman -Sy
+
 # install basic development system, compiler toolchain and build tools
-eval pacman -Sy --needed --noconfirm \
+eval pacman -S --needed --noconfirm \
 bzr \
 intltool \
 base-devel \
@@ -25,7 +28,7 @@ $ARCH-cmake \
 $ARCH-ninja
 
 # install Inkscape dependecies (required)
-eval pacman -Sy --needed --noconfirm \
+eval pacman -S --needed --noconfirm \
 $ARCH-gc \
 $ARCH-gsl \
 $ARCH-popt \
@@ -38,7 +41,7 @@ $ARCH-gtkmm3 \
 $ARCH-gdl
 
 # install Inkscape dependecies (optional)
-eval pacman -Sy --needed --noconfirm \
+eval pacman -S --needed --noconfirm \
 $ARCH-poppler \
 $ARCH-potrace \
 $ARCH-libcdr \
@@ -57,7 +60,7 @@ $ARCH-gtkspell3
 #        "C:\msys64\etc\pacman.conf"
 #     or (always!) run pacman with the additional command line switch
 #        --ignore=mingw-w64-*-imagemagick
-for arch in ${ARCH//,/ }; do
+for arch in $(eval echo $ARCH); do
   case ${arch} in
     mingw-w64-i686)
       pacman -U --needed --noconfirm https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/i686/mingw-w64-i686-imagemagick-6.9.3.7-1-any.pkg.tar.xz
@@ -70,12 +73,12 @@ done
 
 
 # install Python and modules used by Inkscape
-eval pacman -Sy --needed --noconfirm \
+eval pacman -S --needed --noconfirm \
 $ARCH-python2 \
 $ARCH-python2-pip \
 $ARCH-python2-lxml \
 $ARCH-python2-numpy
-for arch in ${ARCH//,/ }; do
+for arch in $(eval echo $ARCH); do
   case ${arch} in
     mingw-w64-i686)
       /mingw32/bin/pip install coverage pyserial scour