Merge pull request #1771 from nikhita/verify-script-follow-ups

hack: clean up verify scripts
kubernetes · Mar 9, 2021 · c3b4923 · c3b4923
2 parents 39e4dd0 + ac18c8a
commit c3b4923
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/hack/verify-yamllint.sh b/hack/verify-yamllint.sh
@@ -36,6 +36,7 @@ if [ $# != 0 ]; then
     exit 1
 fi
 
+# we assume that pip3 is already installed
 if ! command -v yamllint >/dev/null 2>&1; then
   echo "yamllint not found - installing with: ${pip} install -r ${pip_requirements}"
   ${pip} install -r ${pip_requirements}

diff --git a/hack/verify.sh b/hack/verify.sh
@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 # Some useful colors.
 if [[ -z "${color_start-}" ]]; then
@@ -35,7 +35,7 @@ EXCLUDED_PATTERNS=(
   "verify-terraform.sh"          # Expect a cluster as an argument
   )
 
-EXCLUDED_CHECKS=$(ls ${EXCLUDED_PATTERNS[@]/#/${KUBE_ROOT}\/hack\/} 2>/dev/null || true)
+EXCLUDED_CHECKS=$(ls ${EXCLUDED_PATTERNS[@]/#/${REPO_ROOT}\/hack\/} 2>/dev/null || true)
 
 function is-excluded {
   for e in ${EXCLUDED_CHECKS[@]}; do
@@ -111,7 +111,7 @@ if ${SILENT} ; then
 fi
 
 ret=0
-run-checks "${KUBE_ROOT}/hack/verify-*.sh" bash
+run-checks "${REPO_ROOT}/hack/verify-*.sh" bash
 
 if [[ ${ret} -eq 1 ]]; then
     print-failed-tests