diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index 7df99886dd..b703cc3c97 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -38,13 +38,10 @@ ./cluster/update-storage-objects.sh ./cluster/validate-cluster.sh ./hack/cherry_pick_pull.sh -./hack/generate-bindata.sh -./hack/generate-docs.sh ./hack/ginkgo-e2e.sh ./hack/godep-restore.sh ./hack/godep-save.sh ./hack/grab-profiles.sh -./hack/install-etcd.sh ./hack/jenkins/benchmark-dockerized.sh ./hack/jenkins/build.sh ./hack/jenkins/test-dockerized.sh @@ -76,7 +73,6 @@ ./hack/make-rules/vet.sh ./hack/test-integration.sh ./hack/test-update-storage-objects.sh -./hack/update-bazel.sh ./hack/update-codegen.sh ./hack/update-generated-kms-dockerized.sh ./hack/update-generated-protobuf-dockerized.sh diff --git a/hack/generate-bindata.sh b/hack/generate-bindata.sh index 53010175d6..995f1d17f5 100755 --- a/hack/generate-bindata.sh +++ b/hack/generate-bindata.sh @@ -18,7 +18,8 @@ set -o errexit set -o pipefail set -o nounset -export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. +export KUBE_ROOT source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/logging.sh" diff --git a/hack/generate-docs.sh b/hack/generate-docs.sh index 93137878bb..722eb2da56 100755 --- a/hack/generate-docs.sh +++ b/hack/generate-docs.sh @@ -22,7 +22,7 @@ set -o errexit set -o nounset set -o pipefail -KUBE_HACK_ROOT=$(dirname "${BASH_SOURCE}") +KUBE_HACK_ROOT=$(dirname "${BASH_SOURCE[0]}") echo "WARNING: hack/generate-docs.sh is an alias for hack/update-generated-docs.sh" echo "and will be removed in a future version." diff --git a/hack/install-etcd.sh b/hack/install-etcd.sh index 3f5961a536..f66562cd2c 100755 --- a/hack/install-etcd.sh +++ b/hack/install-etcd.sh @@ -21,7 +21,7 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" kube::etcd::install diff --git a/hack/update-bazel.sh b/hack/update-bazel.sh index b6ae73146b..3539c2cdae 100755 --- a/hack/update-bazel.sh +++ b/hack/update-bazel.sh @@ -17,7 +17,8 @@ set -o errexit set -o nounset set -o pipefail -export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. +export KUBE_ROOT source "${KUBE_ROOT}/hack/lib/init.sh" # Ensure that we find the binaries we build before anything else.