From 6720087880e3bbeeecf816c74cc8671b86fc49ba Mon Sep 17 00:00:00 2001 From: Mykola Malkov Date: Thu, 13 Dec 2018 17:07:49 +0200 Subject: [PATCH] TT#48647 Move wget options to array This is more accurate way so do not need to suppress shellcheck warning. Change-Id: I3cd455f88ff87f92089a1729b8ab01430d1de8a2 --- build_iso.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build_iso.sh b/build_iso.sh index 04b25b5..e5cbc65 100755 --- a/build_iso.sh +++ b/build_iso.sh @@ -3,7 +3,10 @@ set -e DATE="$(date +%Y%m%d_%H%M%S)" -WGET_OPT="--timeout=30 -q -c" +declare -a WGET_OPTS=() +WGET_OPTS+=('--timeout=30') +WGET_OPTS+=('-q') +WGET_OPTS+=('-c') # First (former RELEASE) parameter isn't used but kept for backward compatibility _="$1" GRML_ISO="$2" @@ -53,15 +56,12 @@ if [[ -f "${SCRIPTPATH}/${GRML_ISO}" ]]; then echo "*** Grml ISO sha1 [${GRML_ISO}.sha1] is already here ***" else echo "*** Downloading Grml ISO sha1 [${GRML_ISO}.sha1] ***" - # shellcheck disable=SC2086 - wget ${WGET_OPT} -O "${GRML_ISO}.sha1" "${GRML_HASH_URL}${GRML_ISO}.sha1" + wget "${WGET_OPTS[@]}" -O "${GRML_ISO}.sha1" "${GRML_HASH_URL}${GRML_ISO}.sha1" fi else echo "*** Downloading Grml ISO and sha1 files [${GRML_ISO}] ***" - # shellcheck disable=SC2086 - wget ${WGET_OPT} -O "${GRML_ISO}" "${GRML_URL}${GRML_ISO}" - # shellcheck disable=SC2086 - wget ${WGET_OPT} -O "${GRML_ISO}.sha1" "${GRML_HASH_URL}${GRML_ISO}.sha1" + wget "${WGET_OPTS[@]}" -O "${GRML_ISO}" "${GRML_URL}${GRML_ISO}" + wget "${WGET_OPTS[@]}" -O "${GRML_ISO}.sha1" "${GRML_HASH_URL}${GRML_ISO}.sha1" fi echo "*** Building ${MR} ISO ***"