Update Scripts

Author: jason-fox

services

@@ -14,7 +14,7 @@
 # This will force the script to use docker-compose which may be more reliable in 
 # some cases (or if an older version of Docker is being used)
 
-set -e
+set -eo pipefail
 
 dockerCmd="docker compose"
 if (( $# == 2 )); then
@@ -73,7 +73,7 @@ displayServices () {
 
 waitForMongo () {
 	echo -e "\n⏳ Waiting for \033[1mMongoDB\033[0m to be available\n"
-	while ! [ `docker inspect --format='{{.State.Health.Status}}' db-mongo` == "healthy" ]
+	while ! [ "$(docker inspect --format='{{.State.Health.Status}}' db-mongo)" == "healthy" ]
 	do 
 		sleep 1
 	done
@@ -82,9 +82,9 @@ waitForMongo () {
 waitForOrion () {
 	echo -e "\n⏳ Waiting for \033[1;34mOrion\033[0m to be available\n"
 
-	while ! [ `docker inspect --format='{{.State.Health.Status}}' fiware-orion` == "healthy" ]
+	while ! [ "$(docker inspect --format='{{.State.Health.Status}}' fiware-orion)" == "healthy" ]
 	do
-	  echo -e "Context Broker HTTP state: " `curl -s -o /dev/null -w %{http_code} 'http://localhost:1026/version'` " (waiting for 200)"
+	  echo -e "Context Broker HTTP state: " $(curl -s -o /dev/null -w %{http_code} 'http://localhost:1026/version') " (waiting for 200)"
 	  sleep 1
 	done
 }
@@ -95,7 +95,7 @@ case "${command}" in
         echo "usage: services [create|start|stop]"
         ;;
 	"start")
-		export $(cat .env | grep "#" -v)
+		set -a; source .env; set +a
 		stoppingContainers
 		echo -e "Starting containers:  \033[1;34mOrion\033[0m, \033[1mTutorial\033[0m and a \033[1mMongoDB\033[0m database."
 		echo -e "- \033[1;34mOrion\033[0m is the context broker"
@@ -110,11 +110,11 @@ case "${command}" in
 		echo -e "Now open \033[4mhttp://localhost:3000/app/monitor\033[0m"
 		;;
 	"stop")
-		export $(cat .env | grep "#" -v)
+		set -a; source .env; set +a
 		stoppingContainers
 		;;
 	"create")
-		export $(cat .env | grep "#" -v)
+		set -a; source .env; set +a
 		echo "Pulling Docker images"
 		docker pull -q quay.io/curl/curl
 		${dockerCmd} pull --ignore-pull-failures