Skip to content

Commit 59beb8c

Browse files
authored
Merge pull request kubernetes#74299 from SataQiu/fix-shell-20190220
Fix some shellcheck failures in hack
2 parents 7d75b73 + 0311c4d commit 59beb8c

File tree

7 files changed

+7
-15
lines changed

7 files changed

+7
-15
lines changed

hack/.shellcheck_failures

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@
3737
./cluster/test-smoke.sh
3838
./cluster/update-storage-objects.sh
3939
./cluster/validate-cluster.sh
40-
./hack/benchmark-go.sh
41-
./hack/build-cross.sh
42-
./hack/build-go.sh
4340
./hack/cherry_pick_pull.sh
4441
./hack/generate-bindata.sh
4542
./hack/generate-docs.sh
@@ -77,10 +74,8 @@
7774
./hack/make-rules/update.sh
7875
./hack/make-rules/verify.sh
7976
./hack/make-rules/vet.sh
80-
./hack/test-go.sh
8177
./hack/test-integration.sh
8278
./hack/test-update-storage-objects.sh
83-
./hack/update-all.sh
8479
./hack/update-bazel.sh
8580
./hack/update-codegen.sh
8681
./hack/update-generated-kms-dockerized.sh
@@ -95,7 +90,6 @@
9590
./hack/update-staging-godeps.sh
9691
./hack/update-translations.sh
9792
./hack/update-workspace-mirror.sh
98-
./hack/verify-all.sh
9993
./hack/verify-api-groups.sh
10094
./hack/verify-boilerplate.sh
10195
./hack/verify-cli-conventions.sh

hack/benchmark-go.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
22-
2321
make test \
2422
WHAT="$*" \
2523
KUBE_COVER="" \

hack/build-cross.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set -o errexit
2020
set -o nounset
2121
set -o pipefail
2222

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

2525
echo "NOTE: $0 has been replaced by 'make cross'"
2626
echo

hack/build-go.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ set -o errexit
2020
set -o nounset
2121
set -o pipefail
2222

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

2525
# For help output
2626
ARGHELP=""
2727
if [[ "$#" -gt 0 ]]; then
28-
ARGHELP="WHAT='$@'"
28+
ARGHELP="WHAT='$*'"
2929
fi
3030

3131
echo "NOTE: $0 has been replaced by 'make' or 'make all'"

hack/test-go.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ set -o errexit
2020
set -o nounset
2121
set -o pipefail
2222

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

2525
# For help output
2626
ARGHELP=""
2727
if [[ "$#" -gt 0 ]]; then
28-
ARGHELP="WHAT='$@'"
28+
ARGHELP="WHAT='$*'"
2929
fi
3030

3131
echo "NOTE: $0 has been replaced by 'make test'"

hack/update-all.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set -o errexit
2121
set -o nounset
2222
set -o pipefail
2323

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

2626
echo "NOTE: $0 has been replaced by 'make update'"
2727
echo

hack/verify-all.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set -o errexit
2020
set -o nounset
2121
set -o pipefail
2222

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

2525
# For help output
2626
ARGHELP=""

0 commit comments

Comments
 (0)