diff --git a/cluster/kube-down.sh b/cluster/kube-down.sh index 7c183c6eeb..da7a3b23fe 100755 --- a/cluster/kube-down.sh +++ b/cluster/kube-down.sh @@ -20,7 +20,7 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. if [ -f "${KUBE_ROOT}/cluster/env.sh" ]; then source "${KUBE_ROOT}/cluster/env.sh" diff --git a/cluster/kubeadm.sh b/cluster/kubeadm.sh index bf41090209..3035e6c17e 100755 --- a/cluster/kubeadm.sh +++ b/cluster/kubeadm.sh @@ -18,7 +18,7 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE}")/..} +KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE[0]}")/..} source "${KUBE_ROOT}/cluster/clientbin.sh" # If KUBEADM_PATH isn't set, gather up the list of likely places and use ls diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index 6ba671b985..8dbfd9506e 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -24,10 +24,8 @@ ./cluster/images/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.sh ./cluster/juju/prereqs/ubuntu-juju.sh ./cluster/juju/util.sh -./cluster/kube-down.sh ./cluster/kube-up.sh ./cluster/kube-util.sh -./cluster/kubeadm.sh ./cluster/kubectl.sh ./cluster/kubemark/gce/config-default.sh ./cluster/kubemark/iks/config-default.sh @@ -54,7 +52,6 @@ ./hack/e2e-node-test.sh ./hack/generate-bindata.sh ./hack/generate-docs.sh -./hack/get-build.sh ./hack/ginkgo-e2e.sh ./hack/godep-restore.sh ./hack/godep-save.sh diff --git a/hack/get-build.sh b/hack/get-build.sh index f1fbe0289a..69ee76fe15 100755 --- a/hack/get-build.sh +++ b/hack/get-build.sh @@ -18,7 +18,7 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/cluster/common.sh"