From 46d7f7ca17859031c317a501e723267da91c81e3 Mon Sep 17 00:00:00 2001 From: danielqsj Date: Thu, 24 Jan 2019 11:30:38 +0800 Subject: [PATCH] fix shellcheck codegen in code-generator --- hack/.shellcheck_failures | 2 -- .../src/k8s.io/code-generator/hack/update-codegen.sh | 12 ++++++------ .../src/k8s.io/code-generator/hack/verify-codegen.sh | 9 ++++----- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index 2ef9f636eb8..e03c07b07f6 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -165,8 +165,6 @@ ./staging/src/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh ./staging/src/k8s.io/code-generator/generate-groups.sh ./staging/src/k8s.io/code-generator/generate-internal-groups.sh -./staging/src/k8s.io/code-generator/hack/update-codegen.sh -./staging/src/k8s.io/code-generator/hack/verify-codegen.sh ./staging/src/k8s.io/csi-api/hack/update-codegen.sh ./staging/src/k8s.io/csi-api/hack/verify-codegen.sh ./staging/src/k8s.io/kube-aggregator/hack/build-image.sh diff --git a/staging/src/k8s.io/code-generator/hack/update-codegen.sh b/staging/src/k8s.io/code-generator/hack/update-codegen.sh index 2a14fe52771..402c9c9aef9 100755 --- a/staging/src/k8s.io/code-generator/hack/update-codegen.sh +++ b/staging/src/k8s.io/code-generator/hack/update-codegen.sh @@ -22,15 +22,15 @@ set -o pipefail # - --output-base because this script should also be able to run inside the vendor dir of # k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir # instead of the $GOPATH directly. For normal projects this can be dropped. -$(dirname ${BASH_SOURCE})/../generate-internal-groups.sh all \ +"$(dirname "${BASH_SOURCE[0]}")"/../generate-internal-groups.sh all \ k8s.io/code-generator/_examples/apiserver k8s.io/code-generator/_examples/apiserver/apis k8s.io/code-generator/_examples/apiserver/apis \ "example:v1 example2:v1" \ - --output-base "$(dirname ${BASH_SOURCE})/../../.." -$(dirname ${BASH_SOURCE})/../generate-groups.sh all \ + --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." +"$(dirname "${BASH_SOURCE[0]}")"/../generate-groups.sh all \ k8s.io/code-generator/_examples/crd k8s.io/code-generator/_examples/crd/apis \ "example:v1 example2:v1" \ - --output-base "$(dirname ${BASH_SOURCE})/../../.." - $(dirname ${BASH_SOURCE})/../generate-groups.sh all \ + --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." + "$(dirname "${BASH_SOURCE[0]}")"/../generate-groups.sh all \ k8s.io/code-generator/_examples/MixedCase k8s.io/code-generator/_examples/MixedCase/apis \ "example:v1" \ - --output-base "$(dirname ${BASH_SOURCE})/../../.." + --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." diff --git a/staging/src/k8s.io/code-generator/hack/verify-codegen.sh b/staging/src/k8s.io/code-generator/hack/verify-codegen.sh index 497f2a484ca..0e069df68c7 100755 --- a/staging/src/k8s.io/code-generator/hack/verify-codegen.sh +++ b/staging/src/k8s.io/code-generator/hack/verify-codegen.sh @@ -18,8 +18,7 @@ set -o errexit set -o nounset set -o pipefail -SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/.. -SCRIPT_BASE=${SCRIPT_ROOT}/../.. +SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. DIFFROOT="${SCRIPT_ROOT}/_examples" TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/_examples" @@ -50,6 +49,6 @@ fi # smoke test echo "Smoke testing _example by compiling..." -go build ./${SCRIPT_ROOT}/_examples/crd/... -go build ./${SCRIPT_ROOT}/_examples/apiserver/... -go build ./${SCRIPT_ROOT}/_examples/MixedCase/... +go build ./"${SCRIPT_ROOT}"/_examples/crd/... +go build ./"${SCRIPT_ROOT}"/_examples/apiserver/... +go build ./"${SCRIPT_ROOT}"/_examples/MixedCase/...