@@ -18,7 +18,7 @@ set -o errexit
18
18
set -o nounset
19
19
set -o pipefail
20
20
21
- KUBE_ROOT=$( dirname " ${BASH_SOURCE} " ) /..
21
+ KUBE_ROOT=$( dirname " ${BASH_SOURCE[0] } " ) /..
22
22
source " ${KUBE_ROOT} /hack/lib/init.sh"
23
23
source " ${KUBE_ROOT} /hack/lib/util.sh"
24
24
@@ -44,12 +44,10 @@ export IFS=$'\n'
44
44
# NOTE: when "go list -e ./..." is run within GOPATH, it turns the k8s.io/kubernetes
45
45
# as the prefix, however if we run it outside it returns the full path of the file
46
46
# with a leading underscore. We'll need to support both scenarios for all_packages.
47
- all_packages=(
48
- $( go list -e ./... | egrep -v " /(third_party|vendor|staging/src/k8s.io/client-go/pkg|generated|clientset_generated)" | sed -e ' s|^k8s.io/kubernetes/||' -e " s|^_\(${KUBE_ROOT} /\)\{0,1\}||" )
49
- )
50
- failing_packages=(
51
- $( cat $failure_file )
52
- )
47
+ all_packages=()
48
+ while IFS=' ' read -r line; do all_packages+=(" $line " ); done < <( go list -e ./... | grep -vE " /(third_party|vendor|staging/src/k8s.io/client-go/pkg|generated|clientset_generated)" | sed -e ' s|^k8s.io/kubernetes/||' -e " s|^_\(${KUBE_ROOT} /\)\{0,1\}||" )
49
+ failing_packages=()
50
+ while IFS=' ' read -r line; do failing_packages+=(" $line " ); done < <( cat " $failure_file " )
53
51
unset IFS
54
52
errors=()
55
53
not_failing=()
@@ -63,13 +61,13 @@ for p in "${all_packages[@]}"; do
63
61
# completely.
64
62
# Ref: https://github.com/kubernetes/kubernetes/pull/67675
65
63
# Ref: https://github.com/golang/lint/issues/68
66
- failedLint=$( ls " $p " /* .go | egrep -v " (zz_generated.*.go|generated.pb.go|generated.proto|types_swagger_doc_generated.go)" | xargs -L1 golint 2> /dev/null)
64
+ failedLint=$( find " $p " /* .go | grep -vE " (zz_generated.*.go|generated.pb.go|generated.proto|types_swagger_doc_generated.go)" | xargs -L1 golint 2> /dev/null)
67
65
kube::util::array_contains " $p " " ${failing_packages[@]} " && in_failing=$? || in_failing=$?
68
66
if [[ -n " ${failedLint} " ]] && [[ " ${in_failing} " -ne " 0" ]]; then
69
67
errors+=( " ${failedLint} " )
70
68
fi
71
69
if [[ -z " ${failedLint} " ]] && [[ " ${in_failing} " -eq " 0" ]]; then
72
- not_failing+=( $p )
70
+ not_failing+=( " $p " )
73
71
fi
74
72
done
75
73
0 commit comments