From 61e8ac5b95cc985856d5e809d3f3b92f9eb884f2 Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Fri, 20 Oct 2017 07:02:47 -0700 Subject: [PATCH] use array for files to copy, exit on error iterate each element of the array not only the head double-quote --- windeploy_helper.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/windeploy_helper.sh b/windeploy_helper.sh index 45a797c5..f617623f 100644 --- a/windeploy_helper.sh +++ b/windeploy_helper.sh @@ -17,13 +17,13 @@ fi if [[ "$BUILD_TYPE" == "Release" ]]; then echo "Release build" - ICU_FILES="libicuuc57.dll libicuin57.dll libicudt57.dll" + ICU_FILES=(libicuuc57.dll libicuin57.dll libicudt57.dll) else echo "Debug build" - ICU_FILES="libicuucd57.dll libicuind57.dll libicudtd57.dll" + ICU_FILES=(libicuucd57.dll libicuind57.dll libicudtd57.dll) fi -FILES="zlib1.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libjasper-1.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll" +FILES=(zlib1.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libjasper-1.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll) platform=$(get_platform) @@ -33,10 +33,9 @@ elif [[ "$platform" == "mingw32" ]]; then PLATFORM_FILES="libgcc_s_dw2-1.dll" fi -for f in $FILES; do cp $MSYSTEM_PREFIX/bin/$f $TARGET; done +for f in "${FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done -for f in $ICU_FILES; do cp $MSYSTEM_PREFIX/bin/$f $TARGET; done - -for f in $PLATFORM_FILES; do cp $MSYSTEM_PREFIX/bin/$f $TARGET; done +for f in "${ICU_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done +for f in "${PLATFORM_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done