nit shell scripts

kubernetes-sigs · Aug 23, 2019 · 7e5fb90 · 7e5fb90
1 parent 3b89a4e
commit 7e5fb90
Show file tree

Hide file tree

Showing 21 changed files with 56 additions and 86 deletions.
diff --git a/hack/build/go_container.sh b/hack/build/go_container.sh
@@ -15,8 +15,7 @@
 
 # Simple posix sh reproducible build container script with (go) caching
 # Only requires docker on the host
-set -o nounset
-set -o errexit
+set -o nounset -o errexit
 
 # get the repo root for defaulting OUT_DIR and SOURCE_DIR
 # we assume the repo root is two levels up from this script

diff --git a/hack/ci/build-all.sh b/hack/ci/build-all.sh
@@ -16,9 +16,7 @@
 # simple CI script to verify kind's own sources
 # TODO(bentheelder): rename / refactor. consider building kindnetd
 
-set -o errexit
-set -o nounset
-set -o pipefail
+set -o errexit -o nounset -o pipefail
 
 # cd to the repo root
 REPO_ROOT=$(git rev-parse --show-toplevel)

diff --git a/hack/ci/e2e.sh b/hack/ci/e2e.sh
@@ -19,6 +19,8 @@
 
 set -o errexit -o nounset -o pipefail -o xtrace
 
+REPO_ROOT="$(cd "${BASH_SOURCE[0]}"/../.. && pwd -P)"
+
 # our exit handler (trap)
 cleanup() {
   # always attempt to dump logs
@@ -39,7 +41,7 @@ cleanup() {
 # install kind to a tempdir GOPATH from this script's kind checkout
 install_kind() {
   mkdir -p "${TMP_DIR}/bin"
-  make -C "$(dirname "${BASH_SOURCE[0]}")/../.." install INSTALL_PATH="${TMP_DIR}/bin"
+  make -C "${REPO_ROOT}" install INSTALL_PATH="${TMP_DIR}/bin"
   export PATH="${TMP_DIR}/bin:${PATH}"
 }
 

diff --git a/hack/release/build/cross.sh b/hack/release/build/cross.sh
@@ -14,11 +14,10 @@
 # limitations under the License.
 
 # simple script to build binaries for release
-
 set -o errexit -o nounset -o pipefail
 
 # cd to the repo root
-REPO_ROOT=$(git rev-parse --show-toplevel)
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd -P)"
 cd "${REPO_ROOT}"
 
 # controls the number of concurrent builds

diff --git a/hack/release/build/ctr/run.sh b/hack/release/build/ctr/run.sh
@@ -17,13 +17,10 @@
 # NOTE: this is temporary, we only need to build ctr until our (tiny!)
 # --no-unpack patch is available in the standard package
 
-set -o errexit
-set -o nounset
-set -o pipefail
-set -o xtrace
+set -o errexit -o nounset -o pipefail
 
 # cd to the repo root
-REPO_ROOT=$(git rev-parse --show-toplevel)
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../../.." && pwd -P)"
 cd "${REPO_ROOT}"
 
 # options

diff --git a/hack/release/build/push-base.sh b/hack/release/build/push-base.sh
@@ -13,12 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -o errexit
-set -o nounset
-set -o pipefail
+set -o errexit -o nounset -o pipefail
 
 # cd to the repo root
-REPO_ROOT=$(git rev-parse --show-toplevel)
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd -P)"
 cd "${REPO_ROOT}"
 
 # ensure we have up to date kind

diff --git a/hack/release/build/push-node.sh b/hack/release/build/push-node.sh
@@ -13,12 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -o errexit
-set -o nounset
-set -o pipefail
+set -o errexit -o nounset -o pipefail
 
 # cd to the repo root
-REPO_ROOT=$(git rev-parse --show-toplevel)
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd -P)"
 cd "${REPO_ROOT}"
 
 # ensure we have up to date kind

diff --git a/hack/release/create.sh b/hack/release/create.sh
@@ -17,18 +17,18 @@
 # builds binaries between the commits
 # Use like: create.sh <release-version> <next-prerelease-version>
 # EG: create.sh v0.3.0 v0.4.0-alpha
-set -o nounset
-set -o errexit
-set -o pipefail
+set -o errexit -o nounset -o pipefail
 
+# cd to the repo root
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
+cd "${REPO_ROOT}"
+
+# check for arguments
 if [ "$#" -ne 2 ]; then
     echo "Usage: create.sh release-version next-prerelease-version"
     exit 1
 fi
 
-REPO_ROOT=$(git rev-parse --show-toplevel)
-cd "${REPO_ROOT}"
-
 # darwin is great
 SED="sed"
 if which gsed &>/dev/null; then
@@ -65,8 +65,7 @@ set_version "${1}"
 make_commit "${1}"
 add_tag "${1}"
 echo "Building ..."
-make clean
-./hack/release/build/cross.sh
+make clean && ./hack/release/build/cross.sh
 
 # update to the second version
 set_version "${2}"

diff --git a/hack/boilerplate.go.txt → hack/tools/boilerplate.go.txt b/hack/boilerplate.go.txt → hack/tools/boilerplate.go.txt
diff --git a/hack/update/all.sh b/hack/update/all.sh
@@ -14,11 +14,11 @@
 # limitations under the License.
 
 # script to run all update scripts (except deps)
-set -o errexit
-set -o nounset
-set -o pipefail
+set -o errexit -o nounset -o pipefail
 
-REPO_ROOT=$(git rev-parse --show-toplevel)
+# cd to the repo root
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
+cd "${REPO_ROOT}"
 
 "${REPO_ROOT}"/hack/update/deps.sh
 "${REPO_ROOT}"/hack/update/generated.sh

diff --git a/hack/update/deps.sh b/hack/update/deps.sh
@@ -13,18 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-# Runs go mod tidy, go mod vendor, and then prun vendor
+# Runs go mod tidy, go mod vendor, and then prunes vendor
 #
 # Usage:
 #   deps.sh
-
-set -o nounset
-set -o errexit
-set -o pipefail
+set -o errexit -o nounset -o pipefail
 
 # cd to the repo root
-REPO_ROOT=$(git rev-parse --show-toplevel)
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 cd "${REPO_ROOT}"
 
 # enable modules and the proxy cache

diff --git a/hack/update/generated.sh b/hack/update/generated.sh
@@ -14,11 +14,10 @@
 # limitations under the License.
 
 # 'go generate's kind, using tools from vendor (go-bindata)
-set -o nounset
-set -o errexit
-set -o pipefail
+set -o errexit -o nounset -o pipefail
 
-REPO_ROOT="${REPO_ROOT:-$(git rev-parse --show-toplevel)}"
+# cd to the repo root
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 cd "${REPO_ROOT}"
 
 # enable modules and the proxy cache
@@ -54,12 +53,12 @@ export GOPATH="${FAKE_GOPATH}"
 cd "${FAKE_REPOPATH}"
 
 # run the generators
-"${BINDIR}/deepcopy-gen" -i ./pkg/internal/apis/config/ -O zz_generated.deepcopy --go-header-file hack/boilerplate.go.txt
-"${BINDIR}/defaulter-gen" -i ./pkg/internal/apis/config/ -O zz_generated.default --go-header-file hack/boilerplate.go.txt
+"${BINDIR}/deepcopy-gen" -i ./pkg/internal/apis/config/ -O zz_generated.deepcopy --go-header-file hack/tools/boilerplate.go.txt
+"${BINDIR}/defaulter-gen" -i ./pkg/internal/apis/config/ -O zz_generated.default --go-header-file hack/tools/boilerplate.go.txt
 
-"${BINDIR}/deepcopy-gen" -i ./pkg/apis/config/v1alpha3 -O zz_generated.deepcopy --go-header-file hack/boilerplate.go.txt
-"${BINDIR}/defaulter-gen" -i ./pkg/apis/config/v1alpha3 -O zz_generated.default --go-header-file hack/boilerplate.go.txt
-"${BINDIR}/conversion-gen" -i ./pkg/internal/apis/config/v1alpha3 -O zz_generated.conversion --go-header-file hack/boilerplate.go.txt
+"${BINDIR}/deepcopy-gen" -i ./pkg/apis/config/v1alpha3 -O zz_generated.deepcopy --go-header-file hack/tools/boilerplate.go.txt
+"${BINDIR}/defaulter-gen" -i ./pkg/apis/config/v1alpha3 -O zz_generated.default --go-header-file hack/tools/boilerplate.go.txt
+"${BINDIR}/conversion-gen" -i ./pkg/internal/apis/config/v1alpha3 -O zz_generated.conversion --go-header-file hack/tools/boilerplate.go.txt
 
 export GO111MODULE="on"
 cd "${REPO_ROOT}"

diff --git a/hack/update/gofmt.sh b/hack/update/gofmt.sh
@@ -15,8 +15,10 @@
 # limitations under the License.
 
 # script to run gofmt over our code (not vendor)
-set -o errexit
-set -o nounset
-set -o pipefail
+set -o errexit -o nounset -o pipefail
+
+# cd to the repo root
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
+cd "${REPO_ROOT}"
 
 find . -name "*.go" -type f -print0 | xargs -0 gofmt -s -w
diff --git a/hack/verify/all.sh b/hack/verify/all.sh
@@ -13,12 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -o errexit
-set -o nounset
-set -o pipefail
+set -o errexit -o nounset -o pipefail
 
-# cd to repo root
-REPO_ROOT=$(git rev-parse --show-toplevel)
+# cd to the repo root
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 cd "${REPO_ROOT}"
 
 # exit code, if a script fails we'll set this to 1

diff --git a/hack/verify/generated.sh b/hack/verify/generated.sh
@@ -13,15 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -o errexit
-set -o nounset
-set -o pipefail
+set -o errexit -o nounset -o pipefail
 
 # cd to the repo root
-REPO_ROOT=$(git rev-parse --show-toplevel)
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 cd "${REPO_ROOT}"
 
-
 # place to stick temp binaries
 BINDIR="${REPO_ROOT}/bin"
 mkdir -p "${BINDIR}"

diff --git a/hack/verify/gofmt.sh b/hack/verify/gofmt.sh
@@ -13,12 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -o errexit
-set -o nounset
-set -o pipefail
+set -o errexit -o nounset -o pipefail
 
 # cd to the repo root
-REPO_ROOT=$(git rev-parse --show-toplevel)
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 cd "${REPO_ROOT}"
 
 # check for gofmt diffs

diff --git a/hack/verify/golint.sh b/hack/verify/golint.sh
@@ -14,12 +14,10 @@
 # limitations under the License.
 
 # CI script to run go lint over our code
-set -o errexit
-set -o nounset
-set -o pipefail
+set -o errexit -o nounset -o pipefail
 
 # cd to the repo root
-REPO_ROOT=$(git rev-parse --show-toplevel)
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 cd "${REPO_ROOT}"
 
 # enable modules and the proxy cache

diff --git a/hack/verify/govet.sh b/hack/verify/govet.sh
@@ -14,12 +14,10 @@
 # limitations under the License.
 
 # CI script to run go vet over our code
-set -o errexit
-set -o nounset
-set -o pipefail
+set -o errexit -o nounset -o pipefail
 
 # cd to the repo root
-REPO_ROOT=$(git rev-parse --show-toplevel)
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 cd "${REPO_ROOT}"
 
 # enable modules and the proxy cache

diff --git a/hack/verify/shellcheck.sh b/hack/verify/shellcheck.sh
@@ -15,12 +15,10 @@
 # limitations under the License.
 
 # CI script to run shellcheck
-set -o errexit
-set -o nounset
-set -o pipefail
+set -o errexit -o nounset -o pipefail
 
 # cd to the repo root
-REPO_ROOT=$(git rev-parse --show-toplevel)
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 cd "${REPO_ROOT}"
 
 # upstream shellcheck latest stable image as of January 10th, 2019

diff --git a/hack/verify/spelling.sh b/hack/verify/spelling.sh
@@ -13,12 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -o errexit
-set -o nounset
-set -o pipefail
+set -o errexit -o nounset -o pipefail
 
 # cd to the repo root
-REPO_ROOT=$(git rev-parse --show-toplevel)
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 cd "${REPO_ROOT}"
 
 # enable modules and the proxy cache

diff --git a/hack/verify/staticcheck.sh b/hack/verify/staticcheck.sh
@@ -14,12 +14,10 @@
 # limitations under the License.
 
 # CI script to run staticcheck
-set -o errexit
-set -o nounset
-set -o pipefail
+set -o errexit -o nounset -o pipefail
 
 # cd to the repo root
-REPO_ROOT=$(git rev-parse --show-toplevel)
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 cd "${REPO_ROOT}"
 
 # enable modules and the proxy cache