Skip to content

Commit a0bb26b

Browse files
committed
fix: roundup_start script exited for 2.3.0 roundup.
I added 'set -eo pipefail' and must have missed a test case that caused demo mode to exit. Fix this.
1 parent 74c2244 commit a0bb26b

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

scripts/Docker/roundup_start

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ if ! [ -z "$SHELL_DEBUG" ]; then
1515
fi
1616

1717
trap exit INT
18+
trap "echo 'Exiting on pipefail'" ERR
1819

1920
do_exit=0
2021

@@ -38,7 +39,10 @@ for tracker_spec in "$@"; do
3839
# if it's a request to start in demo/shell mode:
3940
case "$tracker" in
4041
demo)
41-
version=$(roundup-admin -v | grep 2.2.0)
42+
# if grep does not find 2.2.0 it exits non-zero and
43+
# because of "-eo pipefail" the script exits. So || true
44+
# so pipeline exits true.
45+
version=$(roundup-admin -v | grep '2\.2\.0' || true)
4246
if [ -n "$version" ]; then
4347
printf "\nRoundup version: %s does not support docker demo mode\n" "$version"
4448
printf "Try building with a version newer than 2.2.0.\n"

0 commit comments

Comments
 (0)