From 9b4b5098e1d3dc88c7cd15d5d2ddb1c59786ba80 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Sun, 23 Jun 2019 17:44:39 -0700 Subject: [PATCH] fix hack/lib/init.sh shellcheck failures --- hack/.shellcheck_failures | 1 - hack/lib/init.sh | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index f9f444ce8eb..654e5f262e6 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -17,7 +17,6 @@ ./cluster/restore-from-backup.sh ./cluster/test-e2e.sh ./cluster/validate-cluster.sh -./hack/lib/init.sh ./hack/lib/test.sh ./hack/lib/version.sh ./hack/test-integration.sh diff --git a/hack/lib/init.sh b/hack/lib/init.sh index 42f34567db9..46b69836efa 100755 --- a/hack/lib/init.sh +++ b/hack/lib/init.sh @@ -29,7 +29,7 @@ unset CDPATH export GO111MODULE=auto # The root of the build/dist directory -KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE}")/../.." && pwd -P)" +KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)" KUBE_OUTPUT_SUBPATH="${KUBE_OUTPUT_SUBPATH:-_output/local}" KUBE_OUTPUT="${KUBE_ROOT}/${KUBE_OUTPUT_SUBPATH}" @@ -44,7 +44,7 @@ KUBE_RSYNC_COMPRESS="${KUBE_RSYNC_COMPRESS:-0}" export no_proxy=127.0.0.1,localhost # This is a symlink to binaries for "this platform", e.g. build tools. -THIS_PLATFORM_BIN="${KUBE_ROOT}/_output/bin" +export THIS_PLATFORM_BIN="${KUBE_ROOT}/_output/bin" source "${KUBE_ROOT}/hack/lib/util.sh" source "${KUBE_ROOT}/hack/lib/logging.sh" @@ -56,6 +56,7 @@ source "${KUBE_ROOT}/hack/lib/golang.sh" source "${KUBE_ROOT}/hack/lib/etcd.sh" KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/$(kube::util::host_platform)" +export KUBE_OUTPUT_HOSTBIN # list of all available group versions. This should be used when generated code # or when starting an API server that you want to have everything. @@ -110,6 +111,7 @@ KUBE_NONSERVER_GROUP_VERSIONS=" imagepolicy.k8s.io/v1alpha1\ admission.k8s.io/v1beta1\ " +export KUBE_NONSERVER_GROUP_VERSIONS # This emulates "readlink -f" which is not available on MacOS X. # Test: