Merge commit '3aefc40813efe34f0e8de035925eea7f74733b47' into prow-update-master

This commit is contained in:
Patrick Ohly
2021-05-21 09:31:20 +02:00
7 changed files with 173 additions and 39 deletions

View File

@@ -84,7 +84,7 @@ done < <(find . -name "*.sh" \
# detect if the host machine has the required shellcheck version installed
# if so, we will use that instead.
HAVE_SHELLCHECK=false
if which shellcheck &>/dev/null; then
if command -v shellcheck &>/dev/null; then
detected_version="$(shellcheck --version | grep 'version: .*')"
if [[ "${detected_version}" = "version: ${SHELLCHECK_VERSION}" ]]; then
HAVE_SHELLCHECK=true