From c6ae694b79df206658808d7d03c183faa7d265c8 Mon Sep 17 00:00:00 2001
From: SataQiu <qiushida@beyondcent.com>
Date: Tue, 26 Feb 2019 12:45:38 +0800
Subject: [PATCH] fix some shellcheck failures in hack

---
 hack/.shellcheck_failures         |  3 ---
 hack/list-feature-tests.sh        |  2 +-
 hack/verify-govet.sh              | 13 ++++++++++---
 hack/verify-staging-meta-files.sh |  8 ++++----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures
index 9904a898246..2fc6afb67d6 100644
--- a/hack/.shellcheck_failures
+++ b/hack/.shellcheck_failures
@@ -44,7 +44,6 @@
 ./hack/lib/test.sh
 ./hack/lib/util.sh
 ./hack/lib/version.sh
-./hack/list-feature-tests.sh
 ./hack/local-up-cluster.sh
 ./hack/make-rules/build.sh
 ./hack/make-rules/clean.sh
@@ -77,12 +76,10 @@
 ./hack/verify-codegen.sh
 ./hack/verify-description.sh
 ./hack/verify-golint.sh
-./hack/verify-govet.sh
 ./hack/verify-import-boss.sh
 ./hack/verify-no-vendor-cycles.sh
 ./hack/verify-openapi-spec.sh
 ./hack/verify-readonly-packages.sh
-./hack/verify-staging-meta-files.sh
 ./hack/verify-test-featuregates.sh
 ./test/cmd/apply.sh
 ./test/cmd/apps.sh
diff --git a/hack/list-feature-tests.sh b/hack/list-feature-tests.sh
index 5d5fcf4339b..5d6bc77923e 100755
--- a/hack/list-feature-tests.sh
+++ b/hack/list-feature-tests.sh
@@ -19,5 +19,5 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 grep "\[Feature:\w+\]" "${KUBE_ROOT}"/test/e2e/**/*.go -Eoh | LC_ALL=C sort -u
diff --git a/hack/verify-govet.sh b/hack/verify-govet.sh
index edc0d314ab8..28c19f58d5a 100755
--- a/hack/verify-govet.sh
+++ b/hack/verify-govet.sh
@@ -20,12 +20,19 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 # For help output
 ARGHELP=""
 if [[ "$#" -gt 0 ]]; then
-    ARGHELP="WHAT='$@'"
+    ARGHELP="WHAT='$*'"
 fi
 
-make --no-print-directory -C "${KUBE_ROOT}" vet WHAT="$@"
+echo "NOTE: $0 has been replaced by 'make vet'"
+echo
+echo "The equivalent of this invocation is: "
+echo "    make vet ${ARGHELP}"
+echo
+echo
+
+make --no-print-directory -C "${KUBE_ROOT}" vet WHAT="$*"
diff --git a/hack/verify-staging-meta-files.sh b/hack/verify-staging-meta-files.sh
index 9e0bb68a9e3..bf656bea948 100755
--- a/hack/verify-staging-meta-files.sh
+++ b/hack/verify-staging-meta-files.sh
@@ -18,9 +18,9 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
-staging_repos=($(ls "${KUBE_ROOT}/staging/src/k8s.io/"))
+IFS=" " read -r -a staging_repos <<< "$(ls "${KUBE_ROOT}/staging/src/k8s.io/")"
 
 expected_filenames=(
   .github/PULL_REQUEST_TEMPLATE.md
@@ -36,8 +36,8 @@ exceptions=(
 )
 
 RESULT=0
-for repo in ${staging_repos[@]}; do
-  for filename in ${expected_filenames[@]}; do
+for repo in "${staging_repos[@]}"; do
+  for filename in "${expected_filenames[@]}"; do
     if echo " ${exceptions[*]} " | grep -F " ${repo}/${filename} " >/dev/null; then
       continue
     elif [ ! -f "${KUBE_ROOT}/staging/src/k8s.io/${repo}/${filename}" ]; then