diff --git a/cluster/clientbin.sh b/cluster/clientbin.sh index 078729eb9d..dc4f673f17 100755 --- a/cluster/clientbin.sh +++ b/cluster/clientbin.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]}")/..} # Detect the OS name/arch so that we can find our binary case "$(uname -s)" in diff --git a/cluster/common.sh b/cluster/common.sh index 2acc6b2600..d7b19b01cf 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -20,7 +20,7 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=$(cd $(dirname "${BASH_SOURCE}")/.. && pwd) +KUBE_ROOT=$(cd $(dirname "${BASH_SOURCE[0]}")/.. && pwd) DEFAULT_KUBECONFIG="${HOME:-.}/.kube/config" diff --git a/cluster/log-dump/log-dump.sh b/cluster/log-dump/log-dump.sh index d9defea525..650295d6c2 100755 --- a/cluster/log-dump/log-dump.sh +++ b/cluster/log-dump/log-dump.sh @@ -63,7 +63,7 @@ readonly max_dump_processes=25 # TODO: Get rid of all the sourcing of bash dependencies eventually. function setup() { - KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. + KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. if [[ -z "${use_custom_instance_list}" ]]; then : ${KUBE_CONFIG_FILE:="config-test.sh"} echo "Sourcing kube-util.sh" diff --git a/cluster/pre-existing/util.sh b/cluster/pre-existing/util.sh index f77b15e910..48d0199d0e 100644 --- a/cluster/pre-existing/util.sh +++ b/cluster/pre-existing/util.sh @@ -18,7 +18,7 @@ # pre-existing Kubernetes master. See test/kubemark/pre-existing/README.md # for me details on using a pre-existing provider. -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. source "${KUBE_ROOT}/cluster/common.sh" source "${KUBE_ROOT}/hack/lib/util.sh" diff --git a/cluster/test-e2e.sh b/cluster/test-e2e.sh index 4ea71b80c7..b42f827813 100755 --- a/cluster/test-e2e.sh +++ b/cluster/test-e2e.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}/cluster/kube-util.sh" echo "Testing cluster with provider: ${KUBERNETES_PROVIDER}" 1>&2 diff --git a/cluster/test-network.sh b/cluster/test-network.sh index 239bb8aa15..cd0d159e8e 100755 --- a/cluster/test-network.sh +++ b/cluster/test-network.sh @@ -24,7 +24,7 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. KUBE_CONFIG_FILE="config-default.sh" ${KUBE_ROOT}/hack/ginkgo-e2e.sh --ginkgo.focus=Networking diff --git a/cluster/test-smoke.sh b/cluster/test-smoke.sh index 3e0561d898..b5e6d34f92 100755 --- a/cluster/test-smoke.sh +++ b/cluster/test-smoke.sh @@ -23,7 +23,7 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. TEST_ARGS="$@" diff --git a/cluster/validate-cluster.sh b/cluster/validate-cluster.sh index c28dcb0df5..a2848149e7 100755 --- a/cluster/validate-cluster.sh +++ b/cluster/validate-cluster.sh @@ -24,7 +24,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"