From 19f3500c9aaa0f3c4c5bf7b47a2e977dfb7cdaf7 Mon Sep 17 00:00:00 2001 From: Paolo Di Tommaso Date: Fri, 15 Apr 2016 18:34:09 +0200 Subject: [PATCH 1/2] Allow KUBE_ROOT to be defined externally --- cluster/kubectl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/kubectl.sh b/cluster/kubectl.sh index 30a57760570..85cc9d00192 100755 --- a/cluster/kubectl.sh +++ b/cluster/kubectl.sh @@ -30,7 +30,7 @@ set -o pipefail # echo "-=-=-=-=-=-=-=-=-=-=" -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +KUBE_ROOT=${KUBE_ROOT:-dirname "${BASH_SOURCE}")/..} source "${KUBE_ROOT}/cluster/kube-util.sh" # Get the absolute path of the directory component of a file, i.e. the From b4704c9a32767f8b074476ae670ce1ebd956c06f Mon Sep 17 00:00:00 2001 From: Paolo Di Tommaso Date: Tue, 19 Apr 2016 13:47:05 +0200 Subject: [PATCH 2/2] Update kubectl.sh --- cluster/kubectl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/kubectl.sh b/cluster/kubectl.sh index 85cc9d00192..be648922869 100755 --- a/cluster/kubectl.sh +++ b/cluster/kubectl.sh @@ -30,7 +30,7 @@ set -o pipefail # echo "-=-=-=-=-=-=-=-=-=-=" -KUBE_ROOT=${KUBE_ROOT:-dirname "${BASH_SOURCE}")/..} +KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE}")/..} source "${KUBE_ROOT}/cluster/kube-util.sh" # Get the absolute path of the directory component of a file, i.e. the