From 741caa447591d986eaa35dc10d1e4b6255eed2f9 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Fri, 19 Apr 2019 23:52:08 +0800 Subject: [PATCH] fix bug and golint failures of hack/verify-api-groups.sh --- hack/.shellcheck_failures | 1 - hack/verify-api-groups.sh | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index 3802b45be9..b13a746e7d 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -41,7 +41,6 @@ ./hack/pin-dependency.sh ./hack/test-integration.sh ./hack/update-vendor.sh -./hack/verify-api-groups.sh ./hack/verify-boilerplate.sh ./hack/verify-cli-conventions.sh ./hack/verify-codegen.sh diff --git a/hack/verify-api-groups.sh b/hack/verify-api-groups.sh index f91805e0e6..32da301594 100755 --- a/hack/verify-api-groups.sh +++ b/hack/verify-api-groups.sh @@ -21,7 +21,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" prefix="${KUBE_ROOT%"k8s.io/kubernetes"}" @@ -98,7 +98,6 @@ packages_without_install=( ) known_version_files=( "pkg/master/import_known_versions.go" - "pkg/client/clientset_generated/internal_clientset/import_known_versions.go" ) for expected_install_package in "${expected_install_packages[@]}"; do found=0 @@ -112,8 +111,8 @@ for expected_install_package in "${expected_install_packages[@]}"; do fi for known_version_file in "${known_version_files[@]}"; do - if ! grep -q "${expected_install_package}/install" ${known_version_files} ; then - echo "missing ${expected_install_package}/install from ${known_version_files}" + if ! grep -q "${expected_install_package}/install" "${known_version_file}" ; then + echo "missing ${expected_install_package}/install from ${known_version_file}" exit 1 fi done