From 50eb2cf59ce1c516e289a25e858ddda13f67efdb Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Wed, 24 Sep 2014 14:25:21 -0700 Subject: [PATCH] fix verify-gofmt's version detection --- .travis.yml | 2 +- hack/verify-gofmt.sh | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b0383b0558f..3b14147e082 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ go: - 1.3 - 1.2 -install: +install: - go get code.google.com/p/go.tools/cmd/cover - ./hack/install-etcd.sh - ./hack/verify-gofmt.sh diff --git a/hack/verify-gofmt.sh b/hack/verify-gofmt.sh index 262637553c4..d929d6dcc3b 100755 --- a/hack/verify-gofmt.sh +++ b/hack/verify-gofmt.sh @@ -17,10 +17,9 @@ # GoFmt apparently is changing @ head... GO_VERSION=($(go version)) -echo "Detected go version: $(go version)" -if [[ ${GO_VERSION[2]} != "go1.2" && ${GO_VERSION[2]} != "go1.3" ]]; then - echo "Unknown go version, skipping gofmt." +if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3') ]]; then + echo "Unknown go version '${GO_VERSION}', skipping gofmt." exit 0 fi