diff --git a/hack/lib/version.sh b/hack/lib/version.sh index 36c012db9b5..f1c22f017d3 100644 --- a/hack/lib/version.sh +++ b/hack/lib/version.sh @@ -107,14 +107,14 @@ kube::version::load_version_vars() { source "${version_file}" } -# golang 1.5 wants `-X key=val`, but golang 1.4- REQUIRES `-X key val` +# golang 1.5+ wants `-X key=val`, but golang 1.4- REQUIRES `-X key val` kube::version::ldflag() { local key=${1} local val=${2} GO_VERSION=($(go version)) - if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.5') ]]; then + if [[ -n $(echo "${GO_VERSION[2]}" | grep -E 'go1.1|go1.2|go1.3|go1.4') ]]; then echo "-X ${KUBE_GO_PACKAGE}/pkg/version.${key} ${val}" else echo "-X ${KUBE_GO_PACKAGE}/pkg/version.${key}=${val}" diff --git a/hack/update-gofmt.sh b/hack/update-gofmt.sh index 75694b09a40..f137a5fc0e9 100755 --- a/hack/update-gofmt.sh +++ b/hack/update-gofmt.sh @@ -24,7 +24,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. GO_VERSION=($(go version)) -if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.4|go1.5') ]]; then +if [[ -n $(echo "${GO_VERSION[2]}" | grep -E 'go1.1|go1.2|go1.3') ]]; then echo "Unsupported go version '${GO_VERSION}', skipping gofmt." exit 0 fi diff --git a/hack/verify-gofmt.sh b/hack/verify-gofmt.sh index cf41dfbfd3c..014035efabf 100755 --- a/hack/verify-gofmt.sh +++ b/hack/verify-gofmt.sh @@ -24,7 +24,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. GO_VERSION=($(go version)) -if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.4|go1.5') ]]; then +if [[ -n $(echo "${GO_VERSION[2]}" | grep -E 'go1.1|go1.2|go1.3') ]]; then echo "Unsupported go version '${GO_VERSION}', skipping gofmt." exit 0 fi