Merge pull request #74060 from SataQiu/fix-shellcheck-20190214

Fix shellcheck failures on kube-down.sh kubeadm.sh get-build.sh
pull/564/head
Kubernetes Prow Robot 2019-02-19 21:41:17 -08:00 committed by GitHub
commit f5989303b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 6 deletions

View File

@ -20,7 +20,7 @@ set -o errexit
set -o nounset
set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
if [ -f "${KUBE_ROOT}/cluster/env.sh" ]; then
source "${KUBE_ROOT}/cluster/env.sh"

View File

@ -18,7 +18,7 @@ set -o errexit
set -o nounset
set -o pipefail
KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE}")/..}
KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE[0]}")/..}
source "${KUBE_ROOT}/cluster/clientbin.sh"
# If KUBEADM_PATH isn't set, gather up the list of likely places and use ls

View File

@ -24,10 +24,8 @@
./cluster/images/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.sh
./cluster/juju/prereqs/ubuntu-juju.sh
./cluster/juju/util.sh
./cluster/kube-down.sh
./cluster/kube-up.sh
./cluster/kube-util.sh
./cluster/kubeadm.sh
./cluster/kubectl.sh
./cluster/kubemark/gce/config-default.sh
./cluster/kubemark/iks/config-default.sh
@ -47,7 +45,6 @@
./hack/cherry_pick_pull.sh
./hack/generate-bindata.sh
./hack/generate-docs.sh
./hack/get-build.sh
./hack/ginkgo-e2e.sh
./hack/godep-restore.sh
./hack/godep-save.sh

View File

@ -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}/cluster/common.sh"