diff --git a/build/util.sh b/build/util.sh index 32152ff921..cfa88fc529 100644 --- a/build/util.sh +++ b/build/util.sh @@ -16,17 +16,17 @@ # Common utility functions for build scripts -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. function kube::release::semantic_version() { # This takes: # Client Version: version.Info{Major:"1", Minor:"1+", GitVersion:"v1.1.0-alpha.0.2328+3c0a05de4a38e3", GitCommit:"3c0a05de4a38e355d147dbfb4d85bad6d2d73bb9", GitTreeState:"clean"} # and spits back the GitVersion piece in a way that is somewhat # resilient to the other fields changing (we hope) - ${KUBE_ROOT}/cluster/kubectl.sh version --client | sed "s/, */\\ -/g" | egrep "^GitVersion:" | cut -f2 -d: | cut -f2 -d\" + "${KUBE_ROOT}/cluster/kubectl.sh" version --client | sed "s/, */\\ +/g" | grep -E "^GitVersion:" | cut -f2 -d: | cut -f2 -d\" } function kube::release::semantic_image_tag_version() { - printf "$(kube::release::semantic_version)" | tr + _ + printf "%s" "$(kube::release::semantic_version)" | tr + _ } diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index 0ed57b71da..165be127c1 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -1,7 +1,6 @@ ./build/common.sh ./build/copy-output.sh ./build/lib/release.sh -./build/util.sh ./cluster/addons/addon-manager/kube-addons.sh ./cluster/addons/fluentd-elasticsearch/es-image/run.sh ./cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh