fix shellcheck failure

pull/564/head
tanshanshan 2019-01-22 08:39:55 +08:00
parent dc3edee5f5
commit 529cfd1437
5 changed files with 13 additions and 17 deletions

View File

@ -56,10 +56,6 @@
./hack/build-cross.sh ./hack/build-cross.sh
./hack/build-go.sh ./hack/build-go.sh
./hack/cherry_pick_pull.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-cluster-size.sh
./hack/e2e-internal/e2e-down.sh ./hack/e2e-internal/e2e-down.sh
./hack/e2e-internal/e2e-grow-cluster.sh ./hack/e2e-internal/e2e-grow-cluster.sh

View File

@ -20,12 +20,11 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
# Build a dev release # Build a dev release
make -f ${KUBE_ROOT}/Makefile quick-release if ! make -f "${KUBE_ROOT}"/Makefile quick-release
then
if [ "$?" != "0" ]; then
echo "Building a release failed!" echo "Building a release failed!"
exit 1 exit 1
fi fi

View File

@ -21,12 +21,13 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
# Build a dev release # 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!" echo "Building the release failed!"
exit 1 exit 1
fi fi

View File

@ -26,16 +26,16 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
KUBE_ROOT="$(dirname "${BASH_SOURCE}")/.." KUBE_ROOT="$(dirname "${BASH_SOURCE[0]}")/.."
source "${KUBE_ROOT}/build/common.sh" source "${KUBE_ROOT}/build/common.sh"
if [[ -z "${REGISTRY:-}" ]]; then if [[ -z "${REGISTRY:-}" ]]; then
echo "REGISTRY must be set" echo "REGISTRY must be set"
exit -1 exit 1
fi fi
if [[ -z "${VERSION:-}" ]]; then if [[ -z "${VERSION:-}" ]]; then
echo "VERSION must be set" echo "VERSION must be set"
exit -1 exit 1
fi fi
IMAGE="${REGISTRY}/conformance-amd64:${VERSION}" IMAGE="${REGISTRY}/conformance-amd64:${VERSION}"

View File

@ -26,16 +26,16 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
KUBE_ROOT="$(dirname "${BASH_SOURCE}")/.." KUBE_ROOT="$(dirname "${BASH_SOURCE[0]}")/.."
source "${KUBE_ROOT}/build/common.sh" source "${KUBE_ROOT}/build/common.sh"
if [[ -z "${REGISTRY:-}" ]]; then if [[ -z "${REGISTRY:-}" ]]; then
echo "REGISTRY must be set" echo "REGISTRY must be set"
exit -1 exit 1
fi fi
if [[ -z "${VERSION:-}" ]]; then if [[ -z "${VERSION:-}" ]]; then
echo "VERSION must be set" echo "VERSION must be set"
exit -1 exit 1
fi fi
IMAGE="${REGISTRY}/hyperkube-amd64:${VERSION}" IMAGE="${REGISTRY}/hyperkube-amd64:${VERSION}"