Skip to content
Snippets Groups Projects
Commit 2ad5171d authored by Thomas Juerges's avatar Thomas Juerges
Browse files

L2SS-225: Move set +e after the check for docker compose

The reason is simple.  When I check for docker-compose, the
execution can fail.  Then I'll check for the built-in
docker compose.  If set -e is active the first failure will result
the script being aborted with no chance to check for the second
option.
parent 9c0463b2
No related branches found
No related tags found
1 merge request!41L2SS-225: Fix rebuild_system_from_scratch.sh to also function on CentOS7
#! /usr/bin/env bash #! /usr/bin/env bash
set -e
HOME_DIR=${LOFAR20_DIR:-${PWD}} HOME_DIR=${LOFAR20_DIR:-${PWD}}
if [ ! -d ${HOME_DIR}/bootstrap ]; then if [ ! -d ${HOME_DIR}/bootstrap ]; then
# HOME_DIR/bootstrap needs to exist for this script to work. # HOME_DIR/bootstrap needs to exist for this script to work.
...@@ -25,6 +23,9 @@ else ...@@ -25,6 +23,9 @@ else
return 1 return 1
fi fi
# Any error should terminate this script.
set -e
# Save for the moment when tango will be cloned. # Save for the moment when tango will be cloned.
OLD_HOME_DIR=${HOME_DIR}.old OLD_HOME_DIR=${HOME_DIR}.old
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment