diff --git a/hack/common.sh b/hack/common.sh index b134bac132..77207ec395 100755 --- a/hack/common.sh +++ b/hack/common.sh @@ -20,6 +20,8 @@ set -o nounset set -o pipefail KOPS_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. >/dev/null 2>&1 && pwd )" +TOOLS_BIN="${KOPS_ROOT}/_output/bin" +export KOPS_ROOT TOOLS_BIN kube::util::array_contains() { local search="$1" diff --git a/hack/update-bazel.sh b/hack/update-bazel.sh index 15a88f3450..bb165423d6 100755 --- a/hack/update-bazel.sh +++ b/hack/update-bazel.sh @@ -22,12 +22,9 @@ set -o pipefail cd "${KOPS_ROOT}" -TMP_OUT=$(mktemp -d) -trap "{ rm -rf ${TMP_OUT}; }" EXIT +GOBIN="${TOOLS_BIN}" go install ./vendor/github.com/bazelbuild/bazel-gazelle/cmd/gazelle -GOBIN="${TMP_OUT}" go install ./vendor/github.com/bazelbuild/bazel-gazelle/cmd/gazelle - -"${TMP_OUT}/gazelle" fix \ +"${TOOLS_BIN}/gazelle" fix \ -external=vendored \ -exclude=tests/e2e \ -mode=fix \ diff --git a/hack/verify-bazel.sh b/hack/verify-bazel.sh index 2c7e5f63c3..06254ea578 100755 --- a/hack/verify-bazel.sh +++ b/hack/verify-bazel.sh @@ -17,12 +17,9 @@ cd "${KOPS_ROOT}" -TMP_OUT=$(mktemp -d) -trap "{ rm -rf ${TMP_OUT}; }" EXIT +GOBIN="${TOOLS_BIN}" go install ./vendor/github.com/bazelbuild/bazel-gazelle/cmd/gazelle -GOBIN="${TMP_OUT}" go install ./vendor/github.com/bazelbuild/bazel-gazelle/cmd/gazelle - -gazelle_diff=$("${TMP_OUT}/gazelle" fix \ +gazelle_diff=$("${TOOLS_BIN}/gazelle" fix \ -external=vendored \ -exclude=tests/e2e \ -mode=diff \ diff --git a/hack/verify-spelling.sh b/hack/verify-spelling.sh index 686a2df613..52a8a9b92f 100755 --- a/hack/verify-spelling.sh +++ b/hack/verify-spelling.sh @@ -22,10 +22,8 @@ set -o pipefail cd "${KOPS_ROOT}" -OUTPUT_GOBIN="${KOPS_ROOT}/_output/bin" - # Install tools we need, but from vendor/ -GOBIN="${OUTPUT_GOBIN}" go install ./vendor/github.com/client9/misspell/cmd/misspell +GOBIN="${TOOLS_BIN}" go install ./vendor/github.com/client9/misspell/cmd/misspell mkdir -p .build/docs @@ -34,6 +32,6 @@ find . -type f \( -name "*.go*" -o -name "*.md*" \) -a -path "./docs/releases/*" xargs -I{} sh -c 'sed -e "/^\* .*github.com\/kubernetes\/kops\/pull/d" docs/releases/{} > .build/docs/$(basename {})' find . -type f \( -name "*.go*" -o -name "*.md*" \) -a \( -not -path "./vendor/*" -not -path "./docs/releases/*" \) | \ sed -e /README-ES.md/d -e /node_modules/d | - xargs ${OUTPUT_GOBIN}/misspell -error + xargs ${TOOLS_BIN}/misspell -error diff --git a/hack/verify-staticcheck.sh b/hack/verify-staticcheck.sh index 9f550f2760..e51da31331 100755 --- a/hack/verify-staticcheck.sh +++ b/hack/verify-staticcheck.sh @@ -50,7 +50,7 @@ IGNORE=( export IFS='|'; ignore_pattern="^(${IGNORE[*]-})\$"; unset IFS # Ensure that we find the binaries we build before anything else. -export GOBIN="${KOPS_ROOT}/_output/bin" +export GOBIN="${TOOLS_BIN}" PATH="${GOBIN}:${PATH}" # Install staticcheck from vendor