aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Miller <dan.r.miller@gmail.com>2017-10-20 07:02:47 -0700
committerDan Miller <dan.r.miller@gmail.com>2017-10-22 16:12:35 -0700
commit61e8ac5b95cc985856d5e809d3f3b92f9eb884f2 (patch)
treee8245ddb727f862f3a2212dd0091d2d387b8a7b3
parent4c75fe47f955603fd9faf416c0f06f942cb575ec (diff)
downloadmonzero-gui-61e8ac5b95cc985856d5e809d3f3b92f9eb884f2.tar.gz
monzero-gui-61e8ac5b95cc985856d5e809d3f3b92f9eb884f2.tar.xz
monzero-gui-61e8ac5b95cc985856d5e809d3f3b92f9eb884f2.zip
use array for files to copy, exit on error
iterate each element of the array not only the head double-quote
-rw-r--r--windeploy_helper.sh13
1 files 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