diff --git a/install/_lib.sh b/install/_lib.sh index ee7bb43520..e4ce0aaaa4 100644 --- a/install/_lib.sh +++ b/install/_lib.sh @@ -56,7 +56,6 @@ function ensure_file_from_example { # Check the version of $1 is greater than or equal to $2 using sort. Note: versions must be stripped of "v" function vergte() { printf "%s\n%s" $1 $2 | sort --version-sort --check=quiet --reverse - echo $? } SENTRY_CONFIG_PY=sentry/sentry.conf.py diff --git a/install/check-minimum-requirements.sh b/install/check-minimum-requirements.sh index fa27588272..e06db42c48 100644 --- a/install/check-minimum-requirements.sh +++ b/install/check-minimum-requirements.sh @@ -8,13 +8,13 @@ if [[ -z "$DOCKER_VERSION" ]]; then exit 1 fi -if [[ "$(vergte ${DOCKER_VERSION//v/} $MIN_DOCKER_VERSION)" -eq 1 ]]; then +if ! vergte ${DOCKER_VERSION//v/} $MIN_DOCKER_VERSION; then echo "FAIL: Expected minimum docker version to be $MIN_DOCKER_VERSION but found $DOCKER_VERSION" exit 1 fi echo "Found Docker version $DOCKER_VERSION" -if [[ "$(vergte ${COMPOSE_VERSION//v/} $MIN_COMPOSE_VERSION)" -eq 1 ]]; then +if ! vergte ${COMPOSE_VERSION//v/} $MIN_COMPOSE_VERSION; then echo "FAIL: Expected minimum $dc_base version to be $MIN_COMPOSE_VERSION but found $COMPOSE_VERSION" exit 1 fi diff --git a/install/dc-detect-version.sh b/install/dc-detect-version.sh index 9d52a42ad7..5c4c373e8a 100644 --- a/install/dc-detect-version.sh +++ b/install/dc-detect-version.sh @@ -20,7 +20,7 @@ if [[ -z "$COMPOSE_VERSION" && -z "$STANDALONE_COMPOSE_VERSION" ]]; then exit 1 fi -if [[ -z "$COMPOSE_VERSION" || -n "$STANDALONE_COMPOSE_VERSION" && "$(vergte ${COMPOSE_VERSION//v/} ${STANDALONE_COMPOSE_VERSION//v/})" -eq 1 ]]; then +if [[ -z "$COMPOSE_VERSION" ]] || [[ -n "$STANDALONE_COMPOSE_VERSION" ]] && ! vergte ${COMPOSE_VERSION//v/} ${STANDALONE_COMPOSE_VERSION//v/}; then COMPOSE_VERSION="${STANDALONE_COMPOSE_VERSION}" dc_base="$dc_base_standalone" fi