clean up lint scripts

.buildkite/lint.sh

@@ -5,6 +5,7 @@ set -e
 cd `dirname $0`/..
 
 go get golang.org/x/lint/golint
+go install golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow
 go get github.com/fzipp/gocyclo
 
-exec ./hooks/pre-commit
+./scripts/lint.sh

hooks/pre-commit

@@ -26,10 +26,8 @@ cd "$tmpdir"
 git --git-dir="${git_dir}" checkout-index -a
 
 # run our checks
-golint
 go fmt
-go vet --shadow
+./scripts/lint.sh
-gocyclo -over 12 .
 go test
 
 # we're done with go so can set GIT_DIR

scripts/lint.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# check the go source for lint. This is run by CI, and the pre-commit hook.
+
+# we *don't* check gofmt here, following the advice at
+# https://golang.org/doc/go1.10#gofmt
+
+set -eu
+
+golint -set_exit_status
+go vet -vettool=$(which shadow)
+gocyclo -over 12 .