Merge pull request kubernetes#73107 from rlenferink/patch-2

Bash script syntax improvements

Author: k8s-ci-robot

hack/gen-swagger-doc/gen-swagger-docs.sh

@@ -37,12 +37,12 @@ top_level_models=$(grep '&[A-Za-z]*{},' /register.go | sed 's/.*&//;s/{},//')
 VERSION="${1#*_}"
 for m in ${top_level_models}
 do
-  if grep -xq "=== ${VERSION}.$m" ./definitions.adoc
+  if grep -xq "=== ${VERSION}.${m}" ./definitions.adoc
   then
-    buf+="* <<${VERSION}.$m>>\n"
+    buf+="* <<${VERSION}.${m}>>\n"
   fi
 done
-sed -i "1i $buf" ./definitions.adoc
+sed -i "1i ${buf}" ./definitions.adoc
 
 # fix the links in .adoc, replace <<x.y>> with link:definitions.html#_x_y[x.y], and lowercase the _x_y part
 sed -i -e 's|<<\(.*\)\.\(.*\)>>|link:#_\L\1_\2\E[\1.\2]|g' ./definitions.adoc

hack/jenkins/build.sh

@@ -30,7 +30,7 @@ set -o xtrace
 # is an incoming variable Jenkins provides us for this job's scratch
 # space.
 export HOME=${WORKSPACE} # Nothing should want Jenkins $HOME
-export PATH=$PATH:/usr/local/go/bin
+export PATH=${PATH}:/usr/local/go/bin
 
 # Skip gcloud update checking
 export CLOUDSDK_COMPONENT_MANAGER_DISABLE_UPDATE_CHECK=true

hack/jenkins/gotest.sh

@@ -28,7 +28,7 @@ set -o xtrace
 # space.
 export HOME=${WORKSPACE} # Nothing should want Jenkins $HOME
 export GOPATH=${HOME}/_gopath
-export PATH=${GOPATH}/bin:${HOME}/third_party/etcd:/usr/local/go/bin:$PATH
+export PATH=${GOPATH}/bin:${HOME}/third_party/etcd:/usr/local/go/bin:${PATH}
 
 # Install a few things needed by unit and /integration tests.
 command -v etcd &>/dev/null || ./hack/install-etcd.sh

hack/jenkins/upload-to-gcs.sh

@@ -139,9 +139,9 @@ function print_started() {
     # will be available as started["metadata"][KEY.lower()].
     echo "    \"metadata\": {"
     local sep=""  # leading commas are easy to track
-    for env_var in $metadata_keys; do
+    for env_var in ${metadata_keys}; do
       local var_upper="${env_var#BUILD_METADATA_}"
-      echo "        $sep\"${var_upper,,}\": \"${!env_var}\""
+      echo "        ${sep}\"${var_upper,,}\": \"${!env_var}\""
       sep=","
     done
     echo "    },"

hack/jenkins/verify-dockerized.sh

@@ -21,7 +21,7 @@ set -o xtrace
 
 retry() {
   for i in {1..5}; do
-    "$@" && return 0 || sleep $i
+    "$@" && return 0 || sleep "${i}"
   done
   "$@"
 }

hack/jenkins/verify.sh

@@ -28,7 +28,7 @@ set -o xtrace
 # space.
 export HOME=${WORKSPACE} # Nothing should want Jenkins $HOME
 export GOPATH=${HOME}/_gopath
-export PATH=${GOPATH}/bin:${HOME}/third_party/etcd:/usr/local/go/bin:$PATH
+export PATH=${GOPATH}/bin:${HOME}/third_party/etcd:/usr/local/go/bin:${PATH}
 
 # Install a few things needed by the verification tests.
 command -v etcd &>/dev/null || ./hack/install-etcd.sh

hack/lib/logging.sh

@@ -34,7 +34,7 @@ kube::log::errexit() {
     kube::log::error "Call tree:"
     for ((i=1;i<${#FUNCNAME[@]}-1;i++))
     do
-      kube::log::error " $i: ${BASH_SOURCE[$i+1]}:${BASH_LINENO[$i]} ${FUNCNAME[$i]}(...)"
+      kube::log::error " ${i}: ${BASH_SOURCE[${i}+1]}:${BASH_LINENO[${i}]} ${FUNCNAME[${i}]}(...)"
     done
   fi  
   kube::log::error_exit "Error in ${BASH_SOURCE[1]}:${BASH_LINENO[0]}. '${BASH_COMMAND}' exited with status $err" "${1:-1}" 1
@@ -66,7 +66,7 @@ kube::log::stack() {
       local source_file=${BASH_SOURCE[$frame_no]}
       local source_lineno=${BASH_LINENO[$((frame_no - 1))]}
       local funcname=${FUNCNAME[$frame_no]}
-      echo "  $i: ${source_file}:${source_lineno} ${funcname}(...)" >&2
+      echo "  ${i}: ${source_file}:${source_lineno} ${funcname}(...)" >&2
     done
   fi
 }