From a4a4abd428561edfd21e613ff09cae34dcd4d893 Mon Sep 17 00:00:00 2001 From: aaa <1693291525@qq.com> Date: Fri, 19 Apr 2019 19:18:18 -0400 Subject: [PATCH] update pull request update pull request on vet.sh --- hack/.shellcheck_failures | 1 - hack/make-rules/vet.sh | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index 55ef10e6d6..a37f9974fd 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -36,7 +36,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[@]}"