From e8a9fc01760e24af60667c3e520cdc6417897089 Mon Sep 17 00:00:00 2001
From: stedif <stefano.difrischia@inaf.it>
Date: Mon, 11 Oct 2021 13:31:59 +0200
Subject: [PATCH] L2SS-409: additional shellcheck fix
---
bin/start-DS.sh | 2 +-
sbin/run_integration_test.sh | 8 ++++----
sbin/tag_and_push_docker_image.sh | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bin/start-DS.sh b/bin/start-DS.sh
index 06ecb4586..a88af6694 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 9bcbe6745..e0b87940b 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 28621bb42..f73016433 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
--
GitLab