diff --git a/Makefile b/Makefile index 1162c32f..9ce23f0d 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ VERSION?= CHANNEL?= VOLUME_MOUNTS=-v "$(CURDIR)":/v -SHELLCHECK_EXCLUSIONS=$(addprefix -e, SC1091 SC1117 SC2317) +SHELLCHECK_EXCLUSIONS=$(addprefix -e, SC1091 SC1117 SC2317 SC2329) SHELLCHECK=docker run --rm $(VOLUME_MOUNTS) -w /v koalaman/shellcheck:stable $(SHELLCHECK_EXCLUSIONS) ENVSUBST_VARS=LOAD_SCRIPT_COMMIT_SHA diff --git a/install.sh b/install.sh index 0734c02d..29f98f12 100755 --- a/install.sh +++ b/install.sh @@ -174,12 +174,12 @@ command_exists() { # version_gte 23.0 // 0 (success) # version_gte 20.10 // 0 (success) # version_gte 19.03 // 0 (success) -# version_gte 21.10 // 1 (fail) +# version_gte 26.1 // 1 (fail) version_gte() { if [ -z "$VERSION" ]; then return 0 fi - eval version_compare "$VERSION" "$1" + version_compare "$VERSION" "$1" } # version_compare compares two version strings (either SemVer (Major.Minor.Path),