Skip to content

Commit a778f40

Browse files
authored
Merge pull request kubernetes#74385 from SataQiu/fix-shell-20190222
Fix some shellcheck failures in hack
2 parents fb92681 + d357bcd commit a778f40

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

hack/.shellcheck_failures

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,10 @@
3131
./cluster/update-storage-objects.sh
3232
./cluster/validate-cluster.sh
3333
./hack/cherry_pick_pull.sh
34-
./hack/generate-bindata.sh
35-
./hack/generate-docs.sh
3634
./hack/ginkgo-e2e.sh
3735
./hack/godep-restore.sh
3836
./hack/godep-save.sh
3937
./hack/grab-profiles.sh
40-
./hack/install-etcd.sh
4138
./hack/jenkins/benchmark-dockerized.sh
4239
./hack/jenkins/build.sh
4340
./hack/jenkins/test-dockerized.sh
@@ -68,7 +65,6 @@
6865
./hack/make-rules/vet.sh
6966
./hack/test-integration.sh
7067
./hack/test-update-storage-objects.sh
71-
./hack/update-bazel.sh
7268
./hack/update-codegen.sh
7369
./hack/update-generated-kms-dockerized.sh
7470
./hack/update-generated-protobuf-dockerized.sh

hack/generate-bindata.sh

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

21-
export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
21+
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
22+
export KUBE_ROOT
2223
source "${KUBE_ROOT}/hack/lib/init.sh"
2324
source "${KUBE_ROOT}/hack/lib/logging.sh"
2425

hack/generate-docs.sh

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

25-
KUBE_HACK_ROOT=$(dirname "${BASH_SOURCE}")
25+
KUBE_HACK_ROOT=$(dirname "${BASH_SOURCE[0]}")
2626

2727
echo "WARNING: hack/generate-docs.sh is an alias for hack/update-generated-docs.sh"
2828
echo "and will be removed in a future version."

hack/install-etcd.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
source "${KUBE_ROOT}/hack/lib/init.sh"
2626

2727
kube::etcd::install

hack/update-bazel.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ set -o errexit
1717
set -o nounset
1818
set -o pipefail
1919

20-
export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
20+
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
21+
export KUBE_ROOT
2122
source "${KUBE_ROOT}/hack/lib/init.sh"
2223

2324
# Ensure that we find the binaries we build before anything else.

0 commit comments

Comments
 (0)