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 {
56
56
# Check the version of $1 is greater than or equal to $2 using sort. Note: versions must be stripped of "v"
57
57
function vergte() {
58
58
printf " %s\n%s" $1 $2 | sort --version-sort --check=quiet --reverse
59
- echo $?
60
59
}
61
60
62
61
SENTRY_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
8
8
exit 1
9
9
fi
10
10
11
- if [[ " $( vergte ${DOCKER_VERSION// v/ } $MIN_DOCKER_VERSION ) " -eq 1 ]] ; then
11
+ if ! vergte ${DOCKER_VERSION// v/ } $MIN_DOCKER_VERSION ; then
12
12
echo " FAIL: Expected minimum docker version to be $MIN_DOCKER_VERSION but found $DOCKER_VERSION "
13
13
exit 1
14
14
fi
15
15
echo " Found Docker version $DOCKER_VERSION "
16
16
17
- if [[ " $( vergte ${COMPOSE_VERSION// v/ } $MIN_COMPOSE_VERSION ) " -eq 1 ]] ; then
17
+ if ! vergte ${COMPOSE_VERSION// v/ } $MIN_COMPOSE_VERSION ; then
18
18
echo " FAIL: Expected minimum $dc_base version to be $MIN_COMPOSE_VERSION but found $COMPOSE_VERSION "
19
19
exit 1
20
20
fi
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ if [[ -z "$COMPOSE_VERSION" && -z "$STANDALONE_COMPOSE_VERSION" ]]; then
21
21
fi
22
22
23
23
if [[ ! -z " ${STANDALONE_COMPOSE_VERSION} " ]]; then
24
- if [[ " $( vergte ${COMPOSE_VERSION// v/ } ${STANDALONE_COMPOSE_VERSION// v/ } ) " -eq 1 ]] ; then
24
+ if ! vergte ${COMPOSE_VERSION// v/ } ${STANDALONE_COMPOSE_VERSION// v/ } ; then
25
25
COMPOSE_VERSION=" ${STANDALONE_COMPOSE_VERSION} "
26
26
dc_base=" $dc_base_standalone "
27
27
fi
You can’t perform that action at this time.
0 commit comments