From 529cfd1437f5090789cdaea9f7151df073bb2414 Mon Sep 17 00:00:00 2001
From: tanshanshan <tan.shanshan@zte.com.cn>
Date: Tue, 22 Jan 2019 08:39:55 +0800
Subject: [PATCH] fix shellcheck failure

---
 hack/.shellcheck_failures    | 4 ----
 hack/dev-build-and-push.sh   | 7 +++----
 hack/dev-build-and-up.sh     | 7 ++++---
 hack/dev-push-conformance.sh | 6 +++---
 hack/dev-push-hyperkube.sh   | 6 +++---
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures
index 07f643d7a3..352aae320e 100644
--- a/hack/.shellcheck_failures
+++ b/hack/.shellcheck_failures
@@ -56,10 +56,6 @@
 ./hack/build-cross.sh
 ./hack/build-go.sh
 ./hack/cherry_pick_pull.sh
-./hack/dev-build-and-push.sh
-./hack/dev-build-and-up.sh
-./hack/dev-push-conformance.sh
-./hack/dev-push-hyperkube.sh
 ./hack/e2e-internal/e2e-cluster-size.sh
 ./hack/e2e-internal/e2e-down.sh
 ./hack/e2e-internal/e2e-grow-cluster.sh
diff --git a/hack/dev-build-and-push.sh b/hack/dev-build-and-push.sh
index 83721142c1..82d45f5c5e 100755
--- a/hack/dev-build-and-push.sh
+++ b/hack/dev-build-and-push.sh
@@ -20,12 +20,11 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 # Build a dev release
-make -f ${KUBE_ROOT}/Makefile quick-release
-
-if [ "$?" != "0" ]; then
+if ! make -f "${KUBE_ROOT}"/Makefile quick-release
+then
         echo "Building a release failed!"
         exit 1
 fi
diff --git a/hack/dev-build-and-up.sh b/hack/dev-build-and-up.sh
index 816f85f829..0e977ed65b 100755
--- a/hack/dev-build-and-up.sh
+++ b/hack/dev-build-and-up.sh
@@ -21,12 +21,13 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 # Build a dev release
-make -f ${KUBE_ROOT}/Makefile quick-release
 
-if [ "$?" != "0" ]; then
+
+if ! make -f "${KUBE_ROOT}"/Makefile quick-release
+then
         echo "Building the release failed!"
         exit 1
 fi
diff --git a/hack/dev-push-conformance.sh b/hack/dev-push-conformance.sh
index 4d5211a081..699d0686ae 100755
--- a/hack/dev-push-conformance.sh
+++ b/hack/dev-push-conformance.sh
@@ -26,16 +26,16 @@ 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"
 
 if [[ -z "${REGISTRY:-}" ]]; then
 	echo "REGISTRY must be set"
-	exit -1
+	exit 1
 fi
 if [[ -z "${VERSION:-}" ]]; then
 	echo "VERSION must be set"
-	exit -1
+	exit 1
 fi
 
 IMAGE="${REGISTRY}/conformance-amd64:${VERSION}"
diff --git a/hack/dev-push-hyperkube.sh b/hack/dev-push-hyperkube.sh
index 48fc69ec30..d3fc968a6c 100755
--- a/hack/dev-push-hyperkube.sh
+++ b/hack/dev-push-hyperkube.sh
@@ -26,16 +26,16 @@ 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"
 
 if [[ -z "${REGISTRY:-}" ]]; then
 	echo "REGISTRY must be set"
-	exit -1
+	exit 1
 fi
 if [[ -z "${VERSION:-}" ]]; then
 	echo "VERSION must be set"
-	exit -1
+	exit 1
 fi
 
 IMAGE="${REGISTRY}/hyperkube-amd64:${VERSION}"