Merge pull request #72955 from BenTheElder/fixup-sh

build/build-image/rsyncd.sh

@@ -45,7 +45,7 @@ mkdir -p "${CONFDIR}"
 if [[ -f "${PIDFILE}" ]]; then
   PID=$(cat "${PIDFILE}")
   echo "Cleaning up old PID file: ${PIDFILE}"
-  kill $PID &> /dev/null || true
+  kill "${PID}" &> /dev/null || true
   rm "${PIDFILE}"
 fi
 

build/copy-output.sh

@@ -19,7 +19,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${KUBE_ROOT}/build/common.sh"
 
 kube::build::verify_prereqs

build/make-build-image.sh

@@ -24,7 +24,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT="$(dirname "${BASH_SOURCE}")/.."
+KUBE_ROOT="$(dirname "${BASH_SOURCE[0]}")/.."
 source "${KUBE_ROOT}/build/common.sh"
 
 kube::build::verify_prereqs

build/make-clean.sh

@@ -19,7 +19,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${KUBE_ROOT}/build/common.sh"
 
 kube::build::verify_prereqs false

build/package-tarballs.sh

@@ -18,7 +18,7 @@ set -o nounset
 set -o pipefail
 
 # Complete the release with the standard env
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${KUBE_ROOT}/build/common.sh"
 source "${KUBE_ROOT}/build/lib/release.sh"
 

build/release-images.sh

@@ -21,7 +21,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${KUBE_ROOT}/build/common.sh"
 source "${KUBE_ROOT}/build/lib/release.sh"
 

build/release-in-a-container.sh

@@ -18,7 +18,7 @@ set -o nounset
 set -o pipefail
 
 # Complete the release with the standard env
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 # Check and error if not "in-a-container"
 if [[ ! -f /.dockerenv ]]; then
@@ -46,4 +46,4 @@ if [[ $KUBE_RELEASE_RUN_TESTS =~ ^[yY]$ ]]; then
   make test
 fi
 
-$KUBE_ROOT/build/package-tarballs.sh
+"${KUBE_ROOT}/build/package-tarballs.sh"

build/release.sh

@@ -25,7 +25,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${KUBE_ROOT}/build/common.sh"
 source "${KUBE_ROOT}/build/lib/release.sh"
 

build/run.sh

@@ -22,7 +22,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "$KUBE_ROOT/build/common.sh"
 
 KUBE_RUN_COPY_OUTPUT="${KUBE_RUN_COPY_OUTPUT:-y}"

build/shell.sh

@@ -22,7 +22,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${KUBE_ROOT}/build/common.sh"
 
 KUBE_RUN_COPY_OUTPUT="${KUBE_RUN_COPY_OUTPUT:-n}" "${KUBE_ROOT}/build/run.sh" bash "$@"

build/util.sh

@@ -16,17 +16,17 @@
 
 # Common utility functions for build scripts
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 function kube::release::semantic_version() {
   # This takes:
   # Client Version: version.Info{Major:"1", Minor:"1+", GitVersion:"v1.1.0-alpha.0.2328+3c0a05de4a38e3", GitCommit:"3c0a05de4a38e355d147dbfb4d85bad6d2d73bb9", GitTreeState:"clean"}
   # and spits back the GitVersion piece in a way that is somewhat
   # resilient to the other fields changing (we hope)
-  ${KUBE_ROOT}/cluster/kubectl.sh version --client | sed "s/, */\\
-/g" | egrep "^GitVersion:" | cut -f2 -d: | cut -f2 -d\"
+  "${KUBE_ROOT}/cluster/kubectl.sh" version --client | sed "s/, */\\
+/g" | grep -E "^GitVersion:" | cut -f2 -d: | cut -f2 -d\"
 }
 
 function kube::release::semantic_image_tag_version() {
-    printf "$(kube::release::semantic_version)" | tr + _
+    printf "%s" "$(kube::release::semantic_version)" | tr + _
 }

hack/.shellcheck_failures

-./build/build-image/rsyncd.sh
 ./build/common.sh
-./build/copy-output.sh
 ./build/lib/release.sh
-./build/make-build-image.sh
-./build/make-clean.sh
-./build/package-tarballs.sh
-./build/release-images.sh
-./build/release-in-a-container.sh
-./build/release.sh
-./build/run.sh
-./build/shell.sh
-./build/util.sh
 ./cluster/addons/addon-manager/kube-addons.sh
 ./cluster/addons/fluentd-elasticsearch/es-image/run.sh
 ./cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh