From 061a0269c7a0710ee8806b97319c463827a98986 Mon Sep 17 00:00:00 2001 From: Hugo Hromic Date: Thu, 25 Apr 2019 10:11:57 +0100 Subject: [PATCH] Silence shellcheck warnings (#279) * SC1091: the `config` file might not be present, which is normal. * SC2086: Double quote to prevent globbing and word splitting. Tested clean output using: `find -name "*.sh" -exec shellcheck -x {} \;` --- build-docker.sh | 1 + build.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build-docker.sh b/build-docker.sh index c969ba2884..cb30c52eb9 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -15,6 +15,7 @@ fi set -e if [ -f config ]; then + # shellcheck disable=SC1091 source config fi diff --git a/build.sh b/build.sh index c41a87fcdb..084d5c6703 100755 --- a/build.sh +++ b/build.sh @@ -203,8 +203,8 @@ if [[ ! "$FIRST_USER_NAME" =~ ^[a-z][-a-z0-9_]*$ ]]; then exit 1 fi -if [[ -n "${APT_PROXY}" ]] && ! curl --silent ${APT_PROXY} >/dev/null ; then - echo "Could not reach APT_PROXY server:" ${APT_PROXY} +if [[ -n "${APT_PROXY}" ]] && ! curl --silent "${APT_PROXY}" >/dev/null ; then + echo "Could not reach APT_PROXY server: ${APT_PROXY}" exit 1 fi