github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make build/util.sh pass shellcheck

pull/564/head
Benjamin Elder 2019-01-16 00:37:13 -08:00
parent b5767bcf89
commit f41efc3ea8
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/util.sh
View File

@ -16,17 +16,17 @@
# Common utility functions for build scripts # Common utility functions for build scripts
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
function kube::release::semantic_version() { function kube::release::semantic_version() {
# This takes: # This takes:
# Client Version: version.Info{Major:"1", Minor:"1+", GitVersion:"v1.1.0-alpha.0.2328+3c0a05de4a38e3", GitCommit:"3c0a05de4a38e355d147dbfb4d85bad6d2d73bb9", GitTreeState:"clean"} # 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 # and spits back the GitVersion piece in a way that is somewhat
# resilient to the other fields changing (we hope) # resilient to the other fields changing (we hope)
${KUBE_ROOT}/cluster/kubectl.sh version --client | sed "s/, */\\ "${KUBE_ROOT}/cluster/kubectl.sh" version --client | sed "s/, */\\
/g" | egrep "^GitVersion:" | cut -f2 -d: | cut -f2 -d\" /g" | grep -E "^GitVersion:" | cut -f2 -d: | cut -f2 -d\"
} }
function kube::release::semantic_image_tag_version() { function kube::release::semantic_image_tag_version() {
printf "$(kube::release::semantic_version)" | tr + _ printf "%s" "$(kube::release::semantic_version)" | tr + _
} }

1
hack/.shellcheck_failures
View File

@ -1,7 +1,6 @@
./build/common.sh ./build/common.sh
./build/copy-output.sh ./build/copy-output.sh
./build/lib/release.sh ./build/lib/release.sh
./build/util.sh
./cluster/addons/addon-manager/kube-addons.sh ./cluster/addons/addon-manager/kube-addons.sh
./cluster/addons/fluentd-elasticsearch/es-image/run.sh ./cluster/addons/fluentd-elasticsearch/es-image/run.sh
./cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh ./cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh