From 04ab994cc337b7ad71b2be226bfd4015867b58b2 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Fri, 19 Apr 2019 18:59:24 +0800 Subject: [PATCH] fix shellcheck failures of hack/verify-description.sh and hack/verify-import-boss.sh --- hack/.shellcheck_failures | 2 -- hack/verify-description.sh | 4 ++-- hack/verify-import-boss.sh | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index ea38736854..7265be73e3 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -49,9 +49,7 @@ ./hack/verify-boilerplate.sh ./hack/verify-cli-conventions.sh ./hack/verify-codegen.sh -./hack/verify-description.sh ./hack/verify-golint.sh -./hack/verify-import-boss.sh ./hack/verify-no-vendor-cycles.sh ./hack/verify-openapi-spec.sh ./hack/verify-readonly-packages.sh diff --git a/hack/verify-description.sh b/hack/verify-description.sh index d35145f95f..17cb9b6dc1 100755 --- a/hack/verify-description.sh +++ b/hack/verify-description.sh @@ -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}/hack/lib/init.sh" kube::golang::setup_env @@ -49,7 +49,7 @@ find_files() { } if [[ $# -eq 0 ]]; then - versioned_api_files=$(find_files | egrep "pkg/.[^/]*/((v.[^/]*)|unversioned)/types\.go") || true + versioned_api_files=$(find_files | grep -E "pkg/.[^/]*/((v.[^/]*)|unversioned)/types\.go") || true else versioned_api_files="${*}" fi diff --git a/hack/verify-import-boss.sh b/hack/verify-import-boss.sh index 30681fbbdd..7b12e514d0 100755 --- a/hack/verify-import-boss.sh +++ b/hack/verify-import-boss.sh @@ -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}/hack/lib/init.sh" kube::golang::setup_env