Skip to content

Commit 5ab36f8

Browse files
authored
Merge pull request kubernetes#77055 from SataQiu/fix-shell-20190426
Fix shellcheck failures of hack/verify-no-vendor-cycles.sh
2 parents a2b50cd + e25e5a6 commit 5ab36f8

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

hack/.shellcheck_failures

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
./hack/test-integration.sh
3333
./hack/update-vendor.sh
3434
./hack/verify-golint.sh
35-
./hack/verify-no-vendor-cycles.sh
3635
./hack/verify-test-featuregates.sh
3736
./test/cmd/apply.sh
3837
./test/cmd/apps.sh

hack/verify-no-vendor-cycles.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,20 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
21+
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
2222

2323
export GO111MODULE=auto
2424

25-
staging_repos=($(ls "${KUBE_ROOT}/staging/src/k8s.io/"))
25+
staging_repos=()
26+
while IFS= read -r repo; do
27+
staging_repos+=( "${repo}" )
28+
done < <(ls "${KUBE_ROOT}/staging/src/k8s.io/")
29+
2630
staging_repos_pattern=$(IFS="|"; echo "${staging_repos[*]}")
2731

2832
failed=false
29-
for i in $(find vendor/ -type d); do
30-
deps=$(go list -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' ./$i 2> /dev/null || echo "")
33+
while IFS= read -r -d '' i; do
34+
deps=$(go list -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' ./"$i" 2> /dev/null || echo "")
3135
deps_on_main=$(echo "${deps}" | grep -v "k8s.io/kubernetes/vendor/" | grep "k8s.io/kubernetes" || echo "")
3236
if [ -n "${deps_on_main}" ]; then
3337
echo "Package ${i} has a cyclic dependency on the main repository."
@@ -38,7 +42,7 @@ for i in $(find vendor/ -type d); do
3842
echo "Package ${i} has a cyclic dependency on staging repository packages: ${deps_on_staging}"
3943
failed=true
4044
fi
41-
done
45+
done < <(find vendor/ -type d)
4246

4347
if [[ "${failed}" == "true" ]]; then
4448
exit 1

0 commit comments

Comments
 (0)