Merge pull request #7755 from oscr/fix-verify-shellcheck

🌱 Fix verify-shellcheck script and fix findings

Author: k8s-ci-robot

hack/ensure-golangci-lint.sh

@@ -167,6 +167,8 @@ echoerr() {
   echo "$@" 1>&2
 }
 log_prefix() {
+  # Invoked indirectly
+  # shellcheck disable=SC2317
   echo "$0"
 }
 _logp=6
@@ -230,7 +232,7 @@ uname_arch() {
     armv6*) arch="armv6" ;;
     armv7*) arch="armv7" ;;
   esac
-  echo ${arch}
+  echo "${arch}"
 }
 uname_os_check() {
   os=$(uname_os)

hack/verify-shellcheck.sh

@@ -73,7 +73,7 @@ fi
 
 echo "Running shellcheck..."
 cd "${ROOT_PATH}" || exit
-IGNORE_FILES=$(find . -name "*.sh" | grep "tilt_modules")
+IGNORE_FILES=$(find . -name "*.sh" | { grep "tilt_modules" || true; })
 echo "Ignoring shellcheck on ${IGNORE_FILES}"
 FILES=$(find . -name "*.sh" -not -path "./tilt_modules/*")
 while read -r file; do