From 2704abf8447958164c10f59e915232f3a1858684 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Tue, 23 Apr 2019 10:13:31 +0800 Subject: [PATCH] fix shellcheck failures of hack/verify-boilerplate.sh verify-cli-conventions.sh verify-codegen.sh --- hack/.shellcheck_failures | 3 --- hack/verify-boilerplate.sh | 7 +++++-- hack/verify-cli-conventions.sh | 2 +- hack/verify-codegen.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index f7fa9e1274..905b630d78 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -37,9 +37,6 @@ ./hack/pin-dependency.sh ./hack/test-integration.sh ./hack/update-vendor.sh -./hack/verify-boilerplate.sh -./hack/verify-cli-conventions.sh -./hack/verify-codegen.sh ./hack/verify-golint.sh ./hack/verify-no-vendor-cycles.sh ./hack/verify-test-featuregates.sh diff --git a/hack/verify-boilerplate.sh b/hack/verify-boilerplate.sh index cb45b73dde..19283371ce 100755 --- a/hack/verify-boilerplate.sh +++ b/hack/verify-boilerplate.sh @@ -18,12 +18,15 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. boilerDir="${KUBE_ROOT}/hack/boilerplate" boiler="${boilerDir}/boilerplate.py" -files_need_boilerplate=($(${boiler} "$@")) +files_need_boilerplate=() +while IFS=$'\n' read -r line; do + files_need_boilerplate+=( "$line" ) +done < <("${boiler}" "$@") # Run boilerplate check if [[ ${#files_need_boilerplate[@]} -gt 0 ]]; then diff --git a/hack/verify-cli-conventions.sh b/hack/verify-cli-conventions.sh index 337bec95ce..61f3707dc1 100755 --- a/hack/verify-cli-conventions.sh +++ b/hack/verify-cli-conventions.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/init.sh" kube::golang::setup_env diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh index a62229be52..6aa52346f0 100755 --- a/hack/verify-codegen.sh +++ b/hack/verify-codegen.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/init.sh" kube::golang::setup_env