From 60d4dac8a00fb393d5689ba8bdde411cbb76701a Mon Sep 17 00:00:00 2001 From: Calvin Leung Huang Date: Tue, 18 Sep 2018 14:28:37 -0700 Subject: [PATCH] Small Makefile and script cleanup (#5354) --- Makefile | 2 +- scripts/goversioncheck.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 67756e7122..9e1a14dafb 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ vet: # source files. prep: fmtcheck @sh -c "'$(CURDIR)/scripts/goversioncheck.sh' '$(GO_VERSION_MIN)'" - go generate $(go list ./... | grep -v /vendor/) + @go generate $(go list ./... | grep -v /vendor/) @if [ -d .git/hooks ]; then cp .hooks/* .git/hooks/; fi # bootstrap the build by downloading additional tools diff --git a/scripts/goversioncheck.sh b/scripts/goversioncheck.sh index 083998e1d5..9b83231b80 100755 --- a/scripts/goversioncheck.sh +++ b/scripts/goversioncheck.sh @@ -5,7 +5,6 @@ echo "==> Checking that build is using go version >= $1..." GO_VERSION=$(go version | grep -o 'go[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' | tr -d 'go') - IFS="." read -r -a GO_VERSION_ARR <<< "$GO_VERSION" IFS="." read -r -a GO_VERSION_REQ <<< "$GO_VERSION_MIN" @@ -17,3 +16,5 @@ if [[ ${GO_VERSION_ARR[0]} -lt ${GO_VERSION_REQ[0]} || echo "Vault requires go $GO_VERSION_MIN to build; found $GO_VERSION." exit 1 fi + +echo "==> Using go version $GO_VERSION..." \ No newline at end of file