Merge pull request #76803 from cblecker/goldflags-fix

Fix shellcheck in hack/lib/golang.sh
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-19 05:53:56 -07:00 committed by GitHub
commit 3b12266c06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions

View File

@ -27,7 +27,6 @@
./hack/cherry_pick_pull.sh
./hack/ginkgo-e2e.sh
./hack/grab-profiles.sh
./hack/lib/golang.sh
./hack/lib/init.sh
./hack/lib/swagger.sh
./hack/lib/test.sh

View File

@ -372,7 +372,7 @@ EOF
# Ensure the go tool exists and is a viable version.
kube::golang::verify_go_version() {
if [[ -z "$(which go)" ]]; then
if [[ -z "$(command -v go)" ]]; then
kube::log::usage_from_stdin <<EOF
Can't find 'go' in PATH, please fix and retry.
See http://golang.org/doc/install for installation instructions.
@ -693,6 +693,10 @@ kube::golang::build_binaries() {
host_platform=$(kube::golang::host_platform)
local goflags goldflags goasmflags gogcflags
# If GOLDFLAGS is unset, then set it to the a default of "-s -w".
# Disable SC2153 for this, as it will throw a warning that the local
# variable goldflags will exist, and it suggest changing it to this.
# shellcheck disable=SC2153
goldflags="${GOLDFLAGS=-s -w} $(kube::version::ldflags)"
goasmflags="-trimpath=${KUBE_ROOT}"
gogcflags="${GOGCFLAGS:-} -trimpath=${KUBE_ROOT}"