File tree Expand file tree Collapse file tree 3 files changed +3
-4
lines changed Expand file tree Collapse file tree 3 files changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -56,7 +56,6 @@ function ensure_file_from_example {
5656# Check the version of $1 is greater than or equal to $2 using sort. Note: versions must be stripped of "v"
5757function vergte() {
5858 printf " %s\n%s" $1 $2 | sort --version-sort --check=quiet --reverse
59- echo $?
6059}
6160
6261SENTRY_CONFIG_PY=sentry/sentry.conf.py
Original file line number Diff line number Diff line change @@ -8,13 +8,13 @@ if [[ -z "$DOCKER_VERSION" ]]; then
88 exit 1
99fi
1010
11- if [[ " $( vergte ${DOCKER_VERSION// v/ } $MIN_DOCKER_VERSION ) " -eq 1 ]] ; then
11+ if ! vergte ${DOCKER_VERSION// v/ } $MIN_DOCKER_VERSION ; then
1212 echo " FAIL: Expected minimum docker version to be $MIN_DOCKER_VERSION but found $DOCKER_VERSION "
1313 exit 1
1414fi
1515echo " Found Docker version $DOCKER_VERSION "
1616
17- if [[ " $( vergte ${COMPOSE_VERSION// v/ } $MIN_COMPOSE_VERSION ) " -eq 1 ]] ; then
17+ if ! vergte ${COMPOSE_VERSION// v/ } $MIN_COMPOSE_VERSION ; then
1818 echo " FAIL: Expected minimum $dc_base version to be $MIN_COMPOSE_VERSION but found $COMPOSE_VERSION "
1919 exit 1
2020fi
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ if [[ -z "$COMPOSE_VERSION" && -z "$STANDALONE_COMPOSE_VERSION" ]]; then
2020 exit 1
2121fi
2222
23- if [[ -z " $COMPOSE_VERSION " || -n " $STANDALONE_COMPOSE_VERSION " && " $( vergte ${COMPOSE_VERSION// v/ } ${STANDALONE_COMPOSE_VERSION// v/ } ) " -eq 1 ]] ; then
23+ if [[ -z " $COMPOSE_VERSION " ]] || [[ -n " $STANDALONE_COMPOSE_VERSION " ]] && ! vergte ${COMPOSE_VERSION// v/ } ${STANDALONE_COMPOSE_VERSION// v/ } ; then
2424 COMPOSE_VERSION=" ${STANDALONE_COMPOSE_VERSION} "
2525 dc_base=" $dc_base_standalone "
2626fi
You can’t perform that action at this time.
0 commit comments