From 9a21343b20ba414c72bffddfc08dc568e939c470 Mon Sep 17 00:00:00 2001 From: Matt Liggett Date: Wed, 30 Aug 2017 15:03:31 -0700 Subject: [PATCH 1/2] Make cluster/common.sh work even if ${HOME} is unset. --- cluster/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/common.sh b/cluster/common.sh index 669e520483..36b180a419 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -22,7 +22,7 @@ set -o pipefail KUBE_ROOT=$(cd $(dirname "${BASH_SOURCE}")/.. && pwd) -DEFAULT_KUBECONFIG="${HOME}/.kube/config" +DEFAULT_KUBECONFIG="${HOME:-.}/.kube/config" source "${KUBE_ROOT}/hack/lib/util.sh" source "${KUBE_ROOT}/cluster/lib/logging.sh" From 0271687533fdf5877741023a75ac3bf9331dd259 Mon Sep 17 00:00:00 2001 From: Matt Liggett Date: Wed, 30 Aug 2017 12:28:03 -0700 Subject: [PATCH 2/2] Add some initial shell parsing tests. These just test to see if there is a bash syntax error in these shell libraries. For #51642 --- cluster/BUILD | 28 ++++++++++++++++++++++++++++ cluster/clientbin.sh | 0 cluster/kube-util.sh | 0 3 files changed, 28 insertions(+) mode change 100644 => 100755 cluster/clientbin.sh mode change 100644 => 100755 cluster/kube-util.sh diff --git a/cluster/BUILD b/cluster/BUILD index d2b7027f8c..86387ceccc 100644 --- a/cluster/BUILD +++ b/cluster/BUILD @@ -46,3 +46,31 @@ pkg_tar( "//cluster/saltbase:salt-manifests", ], ) + +# These tests just verify that bash can interpret the file. +sh_test( + name = "common_test", + srcs = ["common.sh"], + data = [ + ":all-srcs", + ], + deps = ["//hack/lib"], +) + +sh_test( + name = "clientbin_test", + srcs = ["clientbin.sh"], + data = [ + ":all-srcs", + ], + deps = ["//hack/lib"], +) + +sh_test( + name = "kube-util_test", + srcs = ["kube-util.sh"], + data = [ + ":all-srcs", + ], + deps = ["//hack/lib"], +) diff --git a/cluster/clientbin.sh b/cluster/clientbin.sh old mode 100644 new mode 100755 diff --git a/cluster/kube-util.sh b/cluster/kube-util.sh old mode 100644 new mode 100755