From db8bc689463b379444507abd86738e7633e958c3 Mon Sep 17 00:00:00 2001
From: SataQiu <qiushida@beyondcent.com>
Date: Mon, 15 Apr 2019 01:34:02 +0800
Subject: [PATCH] fix shellcheck failures of
 hack/update-generated-kms-dockerized.sh
 hack/update-generated-protobuf-dockerized.sh

---
 hack/.shellcheck_failures                    |  2 --
 hack/update-generated-kms-dockerized.sh      | 14 ++++++++------
 hack/update-generated-protobuf-dockerized.sh | 10 ++++++----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures
index b5b1c14911..24b19e8d51 100644
--- a/hack/.shellcheck_failures
+++ b/hack/.shellcheck_failures
@@ -42,8 +42,6 @@
 ./hack/make-rules/vet.sh
 ./hack/test-integration.sh
 ./hack/test-update-storage-objects.sh
-./hack/update-generated-kms-dockerized.sh
-./hack/update-generated-protobuf-dockerized.sh
 ./hack/update-generated-runtime-dockerized.sh
 ./hack/update-openapi-spec.sh
 ./hack/update-vendor.sh
diff --git a/hack/update-generated-kms-dockerized.sh b/hack/update-generated-kms-dockerized.sh
index 7d61e67e22..0ccae983d1 100755
--- a/hack/update-generated-kms-dockerized.sh
+++ b/hack/update-generated-kms-dockerized.sh
@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 KUBE_KMS_GRPC_ROOT="${KUBE_ROOT}/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1/"
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
@@ -40,22 +40,24 @@ if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3."* ]]; then
 fi
 
 function cleanup {
-	rm -f ${KUBE_KMS_GRPC_ROOT}/service.pb.go.bak
+	rm -f "${KUBE_KMS_GRPC_ROOT}/service.pb.go.bak"
+	rm -f "${KUBE_KMS_GRPC_ROOT}/service.pb.go.tmp"
 }
 
 trap cleanup EXIT
 
-gogopath=$(dirname $(kube::util::find-binary "protoc-gen-gogo"))
+gogopath=$(dirname "$(kube::util::find-binary "protoc-gen-gogo")")
 
 PATH="${gogopath}:${PATH}" \
   protoc \
   --proto_path="${KUBE_KMS_GRPC_ROOT}" \
   --proto_path="${KUBE_ROOT}/vendor" \
-  --gogo_out=plugins=grpc:${KUBE_KMS_GRPC_ROOT} ${KUBE_KMS_GRPC_ROOT}/service.proto
+  --gogo_out=plugins=grpc:"${KUBE_KMS_GRPC_ROOT}" "${KUBE_KMS_GRPC_ROOT}/service.proto"
 
 # Update boilerplate for the generated file.
-echo "$(cat hack/boilerplate/boilerplate.generatego.txt ${KUBE_KMS_GRPC_ROOT}/service.pb.go)" > ${KUBE_KMS_GRPC_ROOT}/service.pb.go
+cat hack/boilerplate/boilerplate.generatego.txt "${KUBE_KMS_GRPC_ROOT}/service.pb.go" > "${KUBE_KMS_GRPC_ROOT}/service.pb.go.tmp" && \
+mv "${KUBE_KMS_GRPC_ROOT}/service.pb.go.tmp" "${KUBE_KMS_GRPC_ROOT}/service.pb.go"
 
 # Run gofmt to clean up the generated code.
 kube::golang::verify_go_version
-gofmt -l -s -w ${KUBE_KMS_GRPC_ROOT}/service.pb.go
+gofmt -l -s -w "${KUBE_KMS_GRPC_ROOT}/service.pb.go"
diff --git a/hack/update-generated-protobuf-dockerized.sh b/hack/update-generated-protobuf-dockerized.sh
index 5104967d99..b7bc5a6637 100755
--- a/hack/update-generated-protobuf-dockerized.sh
+++ b/hack/update-generated-protobuf-dockerized.sh
@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
@@ -41,7 +41,9 @@ fi
 
 gotoprotobuf=$(kube::util::find-binary "go-to-protobuf")
 
-APIROOTS=( ${1} )
+while IFS=$'\n' read -r line; do
+  APIROOTS+=( "$line" );
+done <<< "${1}"
 shift
 
 # requires the 'proto' tag to build (will remove when ready)
@@ -52,6 +54,6 @@ PATH="${KUBE_ROOT}/_output/bin:${PATH}" \
   "${gotoprotobuf}" \
   --proto-import="${KUBE_ROOT}/vendor" \
   --proto-import="${KUBE_ROOT}/third_party/protobuf" \
-  --packages=$(IFS=, ; echo "${APIROOTS[*]}") \
-  --go-header-file ${KUBE_ROOT}/hack/boilerplate/boilerplate.generatego.txt \
+  --packages="$(IFS=, ; echo "${APIROOTS[*]}")" \
+  --go-header-file "${KUBE_ROOT}/hack/boilerplate/boilerplate.generatego.txt" \
   "$@"