Unverified Commit b57387b3 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub

Merge pull request #76767 from SataQiu/fix-shellcheck-20190418

Fix shellcheck failures of hack/verify-openapi-spec.sh
parents 716344fd b4bc5cb4
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
./hack/verify-codegen.sh ./hack/verify-codegen.sh
./hack/verify-golint.sh ./hack/verify-golint.sh
./hack/verify-no-vendor-cycles.sh ./hack/verify-no-vendor-cycles.sh
./hack/verify-openapi-spec.sh
./hack/verify-test-featuregates.sh ./hack/verify-test-featuregates.sh
./test/cmd/apply.sh ./test/cmd/apply.sh
./test/cmd/apps.sh ./test/cmd/apps.sh
......
...@@ -18,7 +18,7 @@ set -o errexit ...@@ -18,7 +18,7 @@ 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}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env kube::golang::setup_env
...@@ -32,10 +32,10 @@ _tmp="${KUBE_ROOT}/_tmp" ...@@ -32,10 +32,10 @@ _tmp="${KUBE_ROOT}/_tmp"
mkdir -p "${_tmp}" mkdir -p "${_tmp}"
cp -a "${SPECROOT}" "${TMP_SPECROOT}" cp -a "${SPECROOT}" "${TMP_SPECROOT}"
trap "cp -a ${TMP_SPECROOT} ${SPECROOT}/..; rm -rf ${_tmp}" EXIT SIGINT trap 'cp -a "${TMP_SPECROOT}" "${SPECROOT}"/..; rm -rf "${_tmp}"' EXIT SIGINT
rm ${SPECROOT}/* rm "${SPECROOT}"/*
cp ${TMP_SPECROOT}/BUILD ${SPECROOT}/BUILD cp "${TMP_SPECROOT}/BUILD" "${SPECROOT}/BUILD"
cp ${TMP_SPECROOT}/README.md ${SPECROOT}/README.md cp "${TMP_SPECROOT}/README.md" "${SPECROOT}/README.md"
"${KUBE_ROOT}/hack/update-openapi-spec.sh" "${KUBE_ROOT}/hack/update-openapi-spec.sh"
echo "diffing ${SPECROOT} against freshly generated openapi spec" echo "diffing ${SPECROOT} against freshly generated openapi spec"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment