clean up shell scripts in cluster-api (kubernetes-sigs#1045)

Author: tariq1890

scripts/ci-build.sh

@@ -20,4 +20,4 @@ set -o pipefail
 
 REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
-cd "$REPO_ROOT" && make manager clusterctl
+cd "${REPO_ROOT}" && make manager clusterctl

scripts/ci-integration.sh

@@ -54,8 +54,8 @@ build_containers() {
    export CONTROLLER_IMG="${CONTROLLER_REPO}"
    export EXAMPLE_PROVIDER_IMG="${EXAMPLE_PROVIDER_REPO}"
 
-   "${MAKE}" docker-build TAG=${VERSION} ARCH=${GOARCH}
-   "${MAKE}" docker-build-ci TAG=${VERSION} ARCH=${GOARCH}
+   "${MAKE}" docker-build TAG="${VERSION}" ARCH="${GOARCH}"
+   "${MAKE}" docker-build-ci TAG="${VERSION}" ARCH="${GOARCH}"
 }
 
 prepare_crd_yaml() {
@@ -85,7 +85,7 @@ wait_pod_running() {
    do
       sleep ${INTERVAL};
       retry=$((retry - 1))
-      if [ $retry -lt 0 ];
+      if [[ $retry -lt 0 ]];
       then
          kubectl describe pod "$1" -n "$2"
          kubectl logs "$1" -n "$2"
@@ -96,7 +96,7 @@ wait_pod_running() {
 }
 
 ensure_docker_in_docker() {
-   if [ -z "${PROW_JOB_ID}" ] ; then
+   if [[ -z "${PROW_JOB_ID}" ]] ; then
       # start docker service in setup other than Prow
       service docker start
    fi
@@ -121,7 +121,7 @@ main() {
    wait_pod_running "provider-controller-manager-0" "provider-system"
    set -e
 
-   if [ -d "${INTEGRATION_TEST_DIR}" ] ; then
+   if [[ -d "${INTEGRATION_TEST_DIR}" ]] ; then
       go test -v "${INTEGRATION_TEST_DIR}"/...
    fi
 

scripts/ci-is-vendor-in-sync.sh

@@ -20,6 +20,6 @@ set -o pipefail
 
 REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
-cd "$REPO_ROOT"
+cd "${REPO_ROOT}"
 find vendor -name 'BUILD.bazel' -delete
 dep check

scripts/ci-make.sh

@@ -20,4 +20,4 @@ set -o pipefail
 
 REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
-cd "$REPO_ROOT" && make lint-full docker-build
+cd "${REPO_ROOT}" && make lint-full docker-build

scripts/ci-test.sh

@@ -20,7 +20,7 @@ set -o pipefail
 
 REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
-cd "$REPO_ROOT" && \
+cd "${REPO_ROOT}" && \
 	source ./scripts/fetch_ext_bins.sh && \
 	fetch_tools && \
 	setup_envs && \

scripts/fetch_ext_bins.sh

@@ -22,7 +22,7 @@ set -o pipefail
 #
 # $ TRACE=1 test.sh
 TRACE=${TRACE:-""}
-if [ -n "$TRACE" ]; then
+if [[ -n "${TRACE}" ]]; then
   set -x
 fi
 
@@ -31,9 +31,9 @@ k8s_version=1.11.0
 goarch=amd64
 goos="unknown"
 
-if [[ "$OSTYPE" == "linux"* ]]; then
+if [[ "${OSTYPE}" == "linux"* ]]; then
   goos="linux"
-elif [[ "$OSTYPE" == "darwin"* ]]; then
+elif [[ "${OSTYPE}" == "darwin"* ]]; then
   goos="darwin"
 fi
 
@@ -47,7 +47,7 @@ fi
 #
 # $ NO_COLOR=1 test.sh
 NO_COLOR=${NO_COLOR:-""}
-if [ -z "$NO_COLOR" ]; then
+if [[ -z "${NO_COLOR}" ]]; then
   header=$'\e[1;33m'
   reset=$'\e[0m'
 else
@@ -61,7 +61,7 @@ function header_text {
 
 tmp_root=/tmp
 
-kb_root_dir=$tmp_root/kubebuilder
+kb_root_dir=${tmp_root}/kubebuilder
 
 # Skip fetching and untaring the tools by setting the SKIP_FETCH_TOOLS variable
 # in your environment to any value:
@@ -75,30 +75,30 @@ SKIP_FETCH_TOOLS=${SKIP_FETCH_TOOLS:-""}
 function prepare_staging_dir {
   header_text "preparing staging dir"
 
-  if [ -z "$SKIP_FETCH_TOOLS" ]; then
-    rm -rf "$kb_root_dir"
+  if [[ -z "${SKIP_FETCH_TOOLS}" ]]; then
+    rm -rf "${kb_root_dir}"
   else
-    rm -f "$kb_root_dir/kubebuilder/bin/kubebuilder"
-    rm -f "$kb_root_dir/kubebuilder/bin/kubebuilder-gen"
-    rm -f "$kb_root_dir/kubebuilder/bin/vendor.tar.gz"
+    rm -f "${kb_root_dir}/kubebuilder/bin/kubebuilder"
+    rm -f "${kb_root_dir}/kubebuilder/bin/kubebuilder-gen"
+    rm -f "${kb_root_dir}/kubebuilder/bin/vendor.tar.gz"
   fi
 }
 
 # fetch k8s API gen tools and make it available under kb_root_dir/bin.
 function fetch_tools {
-  if [ -n "$SKIP_FETCH_TOOLS" ]; then
+  if [[ -n "$SKIP_FETCH_TOOLS" ]]; then
     return 0
   fi
 
   header_text "fetching tools"
-  kb_tools_archive_name="kubebuilder-tools-$k8s_version-$goos-$goarch.tar.gz"
-  kb_tools_download_url="https://storage.googleapis.com/kubebuilder-tools/$kb_tools_archive_name"
+  kb_tools_archive_name="kubebuilder-tools-${k8s_version}-${goos}-${goarch}.tar.gz"
+  kb_tools_download_url="https://storage.googleapis.com/kubebuilder-tools/${kb_tools_archive_name}"
 
-  kb_tools_archive_path="$tmp_root/$kb_tools_archive_name"
-  if [ ! -f $kb_tools_archive_path ]; then
-    curl -fsL ${kb_tools_download_url} -o "$kb_tools_archive_path"
+  kb_tools_archive_path="${tmp_root}/${kb_tools_archive_name}"
+  if [[ ! -f ${kb_tools_archive_path} ]]; then
+    curl -fsL ${kb_tools_download_url} -o "${kb_tools_archive_path}"
   fi
-  tar -zvxf "$kb_tools_archive_path" -C "$tmp_root/"
+  tar -zvxf "${kb_tools_archive_path}" -C "${tmp_root}/"
 }
 
 function setup_envs {