From e25e5a63e7b27e65b0118c3bfedfe1dec84c3f7c Mon Sep 17 00:00:00 2001 From: SataQiu Date: Fri, 26 Apr 2019 00:14:53 +0800 Subject: [PATCH] fix shellcheck failures of hack/verify-no-vendor-cycles.sh --- hack/.shellcheck_failures | 1 - hack/verify-no-vendor-cycles.sh | 14 +++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index 69190b20f6..1b751b2b5c 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -33,7 +33,6 @@ ./hack/test-integration.sh ./hack/update-vendor.sh ./hack/verify-golint.sh -./hack/verify-no-vendor-cycles.sh ./hack/verify-test-featuregates.sh ./test/cmd/apply.sh ./test/cmd/apps.sh diff --git a/hack/verify-no-vendor-cycles.sh b/hack/verify-no-vendor-cycles.sh index 84d1a210d9..30c902d647 100755 --- a/hack/verify-no-vendor-cycles.sh +++ b/hack/verify-no-vendor-cycles.sh @@ -18,16 +18,20 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. export GO111MODULE=auto -staging_repos=($(ls "${KUBE_ROOT}/staging/src/k8s.io/")) +staging_repos=() +while IFS= read -r repo; do + staging_repos+=( "${repo}" ) +done < <(ls "${KUBE_ROOT}/staging/src/k8s.io/") + staging_repos_pattern=$(IFS="|"; echo "${staging_repos[*]}") failed=false -for i in $(find vendor/ -type d); do - deps=$(go list -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' ./$i 2> /dev/null || echo "") +while IFS= read -r -d '' i; do + deps=$(go list -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' ./"$i" 2> /dev/null || echo "") deps_on_main=$(echo "${deps}" | grep -v "k8s.io/kubernetes/vendor/" | grep "k8s.io/kubernetes" || echo "") if [ -n "${deps_on_main}" ]; then echo "Package ${i} has a cyclic dependency on the main repository." @@ -38,7 +42,7 @@ for i in $(find vendor/ -type d); do echo "Package ${i} has a cyclic dependency on staging repository packages: ${deps_on_staging}" failed=true fi -done +done < <(find vendor/ -type d) if [[ "${failed}" == "true" ]]; then exit 1