diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index 249f1b7ff4..8cab139e4f 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -23,8 +23,6 @@ ./hack/lib/version.sh ./hack/make-rules/make-help.sh ./hack/make-rules/test.sh -./hack/make-rules/update.sh -./hack/make-rules/verify.sh ./hack/pin-dependency.sh ./hack/test-integration.sh ./hack/update-vendor.sh diff --git a/hack/make-rules/update.sh b/hack/make-rules/update.sh index a1f8787cba..5b45b2c6f6 100755 --- a/hack/make-rules/update.sh +++ b/hack/make-rules/update.sh @@ -19,7 +19,7 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. source "${KUBE_ROOT}/hack/lib/init.sh" # If called directly, exit. @@ -32,10 +32,6 @@ fi SILENT=${SILENT:-true} ALL=${FORCE_ALL:-false} -V="" -if [[ "${SILENT}" != "true" ]]; then - V="-v" -fi trap 'exit 1' SIGINT @@ -59,10 +55,10 @@ BASH_TARGETS=" update-gofmt" for t in ${BASH_TARGETS}; do - echo -e "${color_yellow}Running ${t}${color_norm}" + echo -e "${color_yellow:?}Running ${t}${color_norm:?}" if ${SILENT} ; then if ! bash "${KUBE_ROOT}/hack/${t}.sh" 1> /dev/null; then - echo -e "${color_red}Running ${t} FAILED${color_norm}" + echo -e "${color_red:?}Running ${t} FAILED${color_norm}" if ! ${ALL}; then exit 1 fi @@ -77,4 +73,4 @@ for t in ${BASH_TARGETS}; do fi done -echo -e "${color_green}Update scripts completed successfully${color_norm}" +echo -e "${color_green:?}Update scripts completed successfully${color_norm}" diff --git a/hack/make-rules/verify.sh b/hack/make-rules/verify.sh index 7e92b4f818..9418ce8cf7 100755 --- a/hack/make-rules/verify.sh +++ b/hack/make-rules/verify.sh @@ -18,7 +18,7 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. source "${KUBE_ROOT}/hack/lib/util.sh" # If KUBE_JUNIT_REPORT_DIR is unset, and ARTIFACTS is set, then have them match. @@ -80,13 +80,13 @@ QUICK_PATTERNS+=( "verify-test-owners.sh" ) -EXCLUDED_CHECKS=$(ls ${EXCLUDED_PATTERNS[@]/#/${KUBE_ROOT}\/hack\/} 2>/dev/null || true) -QUICK_CHECKS=$(ls ${QUICK_PATTERNS[@]/#/${KUBE_ROOT}\/hack\/} 2>/dev/null || true) +while IFS='' read -r line; do EXCLUDED_CHECKS+=("$line"); done < <(ls "${EXCLUDED_PATTERNS[@]/#/${KUBE_ROOT}\/hack\/}" 2>/dev/null || true) +while IFS='' read -r line; do QUICK_CHECKS+=("$line"); done < <(ls "${QUICK_PATTERNS[@]/#/${KUBE_ROOT}\/hack\/}" 2>/dev/null || true) TARGET_LIST=() IFS=" " read -r -a TARGET_LIST <<< "${WHAT:-}" function is-excluded { - for e in ${EXCLUDED_CHECKS[@]}; do + for e in "${EXCLUDED_CHECKS[@]}"; do if [[ $1 -ef "${e}" ]]; then return fi @@ -95,7 +95,7 @@ function is-excluded { } function is-quick { - for e in ${QUICK_CHECKS[@]}; do + for e in "${QUICK_CHECKS[@]}"; do if [[ $1 -ef "${e}" ]]; then return fi @@ -138,9 +138,9 @@ FAILED_TESTS=() function print-failed-tests { echo -e "========================" - echo -e "${color_red}FAILED TESTS${color_norm}" + echo -e "${color_red:?}FAILED TESTS${color_norm:?}" echo -e "========================" - for t in ${FAILED_TESTS[@]}; do + for t in "${FAILED_TESTS[@]}"; do echo -e "${color_red}${t}${color_norm}" done } @@ -150,10 +150,11 @@ function run-checks { local -r runner=$2 local t - for t in $(ls ${pattern}) + for t in ${pattern} do - local check_name="$(basename "${t}")" - if [[ ! -z ${WHAT:-} ]]; then + local check_name + check_name="$(basename "${t}")" + if [[ -n ${WHAT:-} ]]; then if ! is-explicitly-chosen "${check_name}"; then continue fi @@ -168,15 +169,16 @@ function run-checks { fi fi echo -e "Verifying ${check_name}" - local start=$(date +%s) + local start + start=$(date +%s) run-cmd "${runner}" "${t}" && tr=$? || tr=$? - local elapsed=$(($(date +%s) - ${start})) + local elapsed=$(($(date +%s) - start)) if [[ ${tr} -eq 0 ]]; then - echo -e "${color_green}SUCCESS${color_norm} ${check_name}\t${elapsed}s" + echo -e "${color_green:?}SUCCESS${color_norm} ${check_name}\t${elapsed}s" else echo -e "${color_red}FAILED${color_norm} ${check_name}\t${elapsed}s" ret=1 - FAILED_TESTS+=(${t}) + FAILED_TESTS+=("${t}") fi done } @@ -190,7 +192,7 @@ function missing-target-checks { do [[ -z "${v}" ]] && continue - FAILED_TESTS+=(${v}) + FAILED_TESTS+=("${v}") ret=1 done }