Skip to content

Commit 529cfd1

Browse files
author
tanshanshan
committed
fix shellcheck failure
1 parent dc3edee commit 529cfd1

File tree

5 files changed

+13
-17
lines changed

5 files changed

+13
-17
lines changed

hack/.shellcheck_failures

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@
5656
./hack/build-cross.sh
5757
./hack/build-go.sh
5858
./hack/cherry_pick_pull.sh
59-
./hack/dev-build-and-push.sh
60-
./hack/dev-build-and-up.sh
61-
./hack/dev-push-conformance.sh
62-
./hack/dev-push-hyperkube.sh
6359
./hack/e2e-internal/e2e-cluster-size.sh
6460
./hack/e2e-internal/e2e-down.sh
6561
./hack/e2e-internal/e2e-grow-cluster.sh

hack/dev-build-and-push.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ set -o errexit
2020
set -o nounset
2121
set -o pipefail
2222

23-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
23+
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
2424

2525
# Build a dev release
26-
make -f ${KUBE_ROOT}/Makefile quick-release
27-
28-
if [ "$?" != "0" ]; then
26+
if ! make -f "${KUBE_ROOT}"/Makefile quick-release
27+
then
2928
echo "Building a release failed!"
3029
exit 1
3130
fi

hack/dev-build-and-up.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ set -o errexit
2121
set -o nounset
2222
set -o pipefail
2323

24-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
24+
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
2525

2626
# Build a dev release
27-
make -f ${KUBE_ROOT}/Makefile quick-release
2827

29-
if [ "$?" != "0" ]; then
28+
29+
if ! make -f "${KUBE_ROOT}"/Makefile quick-release
30+
then
3031
echo "Building the release failed!"
3132
exit 1
3233
fi

hack/dev-push-conformance.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ set -o errexit
2626
set -o nounset
2727
set -o pipefail
2828

29-
KUBE_ROOT="$(dirname "${BASH_SOURCE}")/.."
29+
KUBE_ROOT="$(dirname "${BASH_SOURCE[0]}")/.."
3030
source "${KUBE_ROOT}/build/common.sh"
3131

3232
if [[ -z "${REGISTRY:-}" ]]; then
3333
echo "REGISTRY must be set"
34-
exit -1
34+
exit 1
3535
fi
3636
if [[ -z "${VERSION:-}" ]]; then
3737
echo "VERSION must be set"
38-
exit -1
38+
exit 1
3939
fi
4040

4141
IMAGE="${REGISTRY}/conformance-amd64:${VERSION}"

hack/dev-push-hyperkube.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ set -o errexit
2626
set -o nounset
2727
set -o pipefail
2828

29-
KUBE_ROOT="$(dirname "${BASH_SOURCE}")/.."
29+
KUBE_ROOT="$(dirname "${BASH_SOURCE[0]}")/.."
3030
source "${KUBE_ROOT}/build/common.sh"
3131

3232
if [[ -z "${REGISTRY:-}" ]]; then
3333
echo "REGISTRY must be set"
34-
exit -1
34+
exit 1
3535
fi
3636
if [[ -z "${VERSION:-}" ]]; then
3737
echo "VERSION must be set"
38-
exit -1
38+
exit 1
3939
fi
4040

4141
IMAGE="${REGISTRY}/hyperkube-amd64:${VERSION}"

0 commit comments

Comments
 (0)