fix verify-gofmt's version detection

duda · Sep 24, 2014 · 50eb2cf · 50eb2cf
1 parent 9564dac
commit 50eb2cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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