From 47178dc5c5e387e36e5115419754b46c0e8fe608 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 4 Jun 2020 12:53:08 +0100
Subject: [PATCH] clean up lint scripts

---
 .buildkite/lint.sh |  3 ++-
 hooks/pre-commit   |  4 +---
 scripts/lint.sh    | 12 ++++++++++++
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100755 scripts/lint.sh

diff --git a/.buildkite/lint.sh b/.buildkite/lint.sh
index 454be01..b355123 100755
--- a/.buildkite/lint.sh
+++ b/.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
diff --git a/hooks/pre-commit b/hooks/pre-commit
index af3b2e7..d6d6b20 100755
--- a/hooks/pre-commit
+++ b/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
-gocyclo -over 12 .
+./scripts/lint.sh
 go test
 
 # we're done with go so can set GIT_DIR
diff --git a/scripts/lint.sh b/scripts/lint.sh
new file mode 100755
index 0000000..482a4af
--- /dev/null
+++ b/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 .