diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index eac68a25ae..39091a35f5 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -27,7 +27,6 @@ ./hack/make-rules/test.sh ./hack/make-rules/update.sh ./hack/make-rules/verify.sh -./hack/make-rules/vet.sh ./hack/pin-dependency.sh ./hack/test-integration.sh ./hack/update-vendor.sh diff --git a/hack/make-rules/vet.sh b/hack/make-rules/vet.sh index e670c90538..40ed0c9e5d 100755 --- a/hack/make-rules/vet.sh +++ b/hack/make-rules/vet.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" cd "${KUBE_ROOT}" @@ -47,7 +47,9 @@ done if [[ ${#targets[@]} -eq 0 ]]; then # Do not run on third_party directories or generated client code or build tools. - targets=$(go list -e ./... | egrep -v "/(build|third_party|vendor|staging|clientset_generated)/") + while IFS='' read -r line; do + targets+=("${line}") + done < <(go list -e ./... | grep -E -v "/(build|third_party|vendor|staging|clientset_generated)/") fi -go vet "${goflags[@]:+${goflags[@]}}" ${targets[@]} +go vet "${goflags[@]:+${goflags[@]}}" "${targets[@]}"