diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index e1f8f816cf5..08f73790642 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -41,7 +41,6 @@ ./hack/lib/swagger.sh ./hack/lib/test.sh ./hack/lib/version.sh -./hack/list-feature-tests.sh ./hack/local-up-cluster.sh ./hack/make-rules/clean.sh ./hack/make-rules/helpers/cache_go_dirs.sh @@ -71,12 +70,10 @@ ./hack/verify-codegen.sh ./hack/verify-description.sh ./hack/verify-golint.sh -./hack/verify-govet.sh ./hack/verify-import-boss.sh ./hack/verify-no-vendor-cycles.sh ./hack/verify-openapi-spec.sh ./hack/verify-readonly-packages.sh -./hack/verify-staging-meta-files.sh ./hack/verify-test-featuregates.sh ./test/cmd/apply.sh ./test/cmd/apps.sh diff --git a/hack/list-feature-tests.sh b/hack/list-feature-tests.sh index 5d5fcf4339b..5d6bc77923e 100755 --- a/hack/list-feature-tests.sh +++ b/hack/list-feature-tests.sh @@ -19,5 +19,5 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. grep "\[Feature:\w+\]" "${KUBE_ROOT}"/test/e2e/**/*.go -Eoh | LC_ALL=C sort -u diff --git a/hack/verify-govet.sh b/hack/verify-govet.sh index edc0d314ab8..28c19f58d5a 100755 --- a/hack/verify-govet.sh +++ b/hack/verify-govet.sh @@ -20,12 +20,19 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. # For help output ARGHELP="" if [[ "$#" -gt 0 ]]; then - ARGHELP="WHAT='$@'" + ARGHELP="WHAT='$*'" fi -make --no-print-directory -C "${KUBE_ROOT}" vet WHAT="$@" +echo "NOTE: $0 has been replaced by 'make vet'" +echo +echo "The equivalent of this invocation is: " +echo " make vet ${ARGHELP}" +echo +echo + +make --no-print-directory -C "${KUBE_ROOT}" vet WHAT="$*" diff --git a/hack/verify-staging-meta-files.sh b/hack/verify-staging-meta-files.sh index 9e0bb68a9e3..dac7cdb77e4 100755 --- a/hack/verify-staging-meta-files.sh +++ b/hack/verify-staging-meta-files.sh @@ -18,9 +18,7 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. - -staging_repos=($(ls "${KUBE_ROOT}/staging/src/k8s.io/")) +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. expected_filenames=( .github/PULL_REQUEST_TEMPLATE.md @@ -36,8 +34,9 @@ exceptions=( ) RESULT=0 -for repo in ${staging_repos[@]}; do - for filename in ${expected_filenames[@]}; do +for full_repo_path in "${KUBE_ROOT}"/staging/src/k8s.io/*; do + repo=$(basename "${full_repo_path}") + for filename in "${expected_filenames[@]}"; do if echo " ${exceptions[*]} " | grep -F " ${repo}/${filename} " >/dev/null; then continue elif [ ! -f "${KUBE_ROOT}/staging/src/k8s.io/${repo}/${filename}" ]; then