diff --git a/bin/start-DS.sh b/bin/start-DS.sh index 06ecb4586e01eff360952ead8af5639ac2a608ee..a88af669476feece7b628df81723f4c45a4a7e42 100755 --- a/bin/start-DS.sh +++ b/bin/start-DS.sh @@ -2,7 +2,7 @@ function help() { why="${1}" - echo -e "*** Cannot start the Python device server.\n${why}\n\n* The Python file for the device server must be the 1st parameter that is provided.\n* The instance of this device server must be the 2nd parameter that is provided." + echo -e "*** Cannot start the Python device server.\\n${why}\\n\\n* The Python file for the device server must be the 1st parameter that is provided.\\n* The instance of this device server must be the 2nd parameter that is provided." exit -1 } diff --git a/sbin/run_integration_test.sh b/sbin/run_integration_test.sh index 9bcbe674506e53c1b719cd533a03e85455556d15..e0b87940b9ac9776a812b2e7cda5d9fa851e9200 100755 --- a/sbin/run_integration_test.sh +++ b/sbin/run_integration_test.sh @@ -1,12 +1,12 @@ #!/bin/bash -e -if [ -z "$LOFA20_DIR" ]; then +if [ -z "$LOFAR20_DIR" ]; then # We assume we aren't in the PATH, so we can derive our path. # We need our parent directory. - LOFAR20_DIR_RELATIVE=`dirname "$0"`/.. + LOFAR20_DIR_RELATIVE=$(dirname "$0")/.. # As an absolute path - LOFAR20_DIR=`readlink -f "${LOFAR20_DIR_RELATIVE}"` + LOFAR20_DIR=$(readlink -f "${LOFAR20_DIR_RELATIVE}") fi # Start and stop sequence @@ -18,7 +18,7 @@ make start databaseds dsconfig jupyter elk sleep 15 # Update the dsconfig -${LOFAR20_DIR}/sbin/update_ConfigDb.sh ${LOFAR20_DIR}/CDB/integration_ConfigDb.json +"${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${LOFAR20_DIR}"/CDB/integration_ConfigDb.json cd "$LOFAR20_DIR/docker-compose" || exit 1 make start sdptr-sim recv-sim unb2-sim diff --git a/sbin/tag_and_push_docker_image.sh b/sbin/tag_and_push_docker_image.sh index 28621bb428c2803e78bb6ad4b56535764d590667..f7301643381c47a90b9f83eff7bb890515b72f4d 100755 --- a/sbin/tag_and_push_docker_image.sh +++ b/sbin/tag_and_push_docker_image.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash -e +#!/usr/bin/env/bash -e # Tag and push which image version? DOCKER_TAG=latest