Merge pull request openshift#115 from russellb/hack-scripts

Add hack/shellcheck.sh and fix shellcheck warnings.
honza · Oct 9, 2019 · 86c4639 · 86c4639
2 parents 7b6f5eb + 2664ab6
commit 86c4639
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/hack/gofmt.sh b/hack/gofmt.sh
@@ -6,7 +6,7 @@ IS_CONTAINER=${IS_CONTAINER:-false}
 
 if [ "${IS_CONTAINER}" != "false" ]; then
   TOP_DIR="${1:-.}"
-  go fmt ${TOP_DIR}/pkg/... ${TOP_DIR}/cmd/...
+  go fmt "${TOP_DIR}"/pkg/... "${TOP_DIR}"/cmd/...
 else
   podman run --rm \
     --env IS_CONTAINER=TRUE \

diff --git a/hack/govet.sh b/hack/govet.sh
@@ -6,7 +6,7 @@ IS_CONTAINER=${IS_CONTAINER:-false}
 
 if [ "${IS_CONTAINER}" != "false" ]; then
   TOP_DIR="${1:-.}"
-  go vet ${TOP_DIR}/pkg/... ${TOP_DIR}/cmd/...
+  go vet "${TOP_DIR}"/pkg/... "${TOP_DIR}"/cmd/...
 else
   podman run --rm \
     --env IS_CONTAINER=TRUE \

diff --git a/hack/shellcheck.sh b/hack/shellcheck.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -eux
+
+IS_CONTAINER=${IS_CONTAINER:-false}
+
+if [ "${IS_CONTAINER}" != "false" ]; then
+  TOP_DIR="${1:-.}"
+  find "${TOP_DIR}" -path ./vendor -prune -o -name '*.sh' -exec shellcheck -s bash {} \+
+else
+  podman run --rm \
+    --env IS_CONTAINER=TRUE \
+    --volume "${PWD}:/workdir:ro,z" \
+    --entrypoint sh \
+    --workdir /workdir \
+    registry.hub.docker.com/koalaman/shellcheck-alpine:stable \
+    /workdir/hack/shellcheck.sh "${@}"
+fi;
diff --git a/hack/unit.sh b/hack/unit.sh
@@ -7,10 +7,10 @@ IS_CONTAINER=${IS_CONTAINER:-false}
 if [ "${IS_CONTAINER}" != "false" ]; then
   TOP_DIR="${1:-$(pwd)}"
   cd /
-  ${TOP_DIR}/tools/install_kustomize.sh
-  ${TOP_DIR}/tools/install_kubebuilder.sh
+  "${TOP_DIR}"/tools/install_kustomize.sh
+  "${TOP_DIR}"/tools/install_kubebuilder.sh
   mv kubebuilder /usr/local/.
-  cd ${TOP_DIR}
+  cd "${TOP_DIR}"
   go test ./pkg/... ./cmd/... -coverprofile /cover.out
 else
   podman run --rm \

diff --git a/tools/install_kustomize.sh b/tools/install_kustomize.sh
@@ -1,4 +1,4 @@
 #!/bin/bash -x
-mkdir -p $GOPATH/bin
-curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o $GOPATH/bin/kustomize
-chmod +x $GOPATH/bin/kustomize
+mkdir -p "$GOPATH"/bin
+curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o "$GOPATH"/bin/kustomize
+chmod +x "$GOPATH"/bin/kustomize