Fix handling of cd errors.

Author: RLIndia

products/rg_imgbldr.yml

@@ -349,9 +349,9 @@ Outputs:
     Description: Nextflow_Advanced Image Builder Pipeline
     Value: !Ref NextflowAdvancedImagePipeline
     Export:
-      Name: "NextflowAdvancedImagePipeline"
+      Name: !Sub "${AWS::StackName}-NextflowAdvancedImagePipeline"
   RStudioImagePipeline:
     Description: RStudio Image Builder Pipeline
     Value: !Ref RStudioImagePipeline
     Export:
-      Name: "RStudioPipelineName"
+      Name: !Sub "${AWS::StackName}-RStudioPipelineName"

scripts/fixmongo.sh

@@ -93,6 +93,7 @@ db.createUser({user: "admin",pwd: "$2",roles: [ { role: "userAdminAnyDatabase",
 db.createUser({user: "$3", pwd: "$4", roles: [{role: 'readWriteMinusDropRole', db: "$1"}]})
 EOF
 
+# trunk-ignore(shellcheck/SC2181)
 [ $? -gt 0 ] && echo "Could not create roles and configs. Exiting!" && exit 1
 rootca="${RG_HOME}/config/rootCA.key"
 rlca="${RG_HOME}/config/RL-CA.pem"
@@ -121,7 +122,6 @@ else
 	exit 1
 fi
 
-cd "$RG_HOME" || exit
 if [ -f "$RG_HOME/docker-compose.yml" ]; then
 	echo "docker-compose.yml exists"
 	sed -i -e "s/DB_HOST.*/DB_HOST=$myip/" "$RG_HOME/docker-compose.yml"

scripts/fixswarm.sh

@@ -1,18 +1,20 @@
 #!/bin/bash
-version="0.1.2"
+version="0.1.3"
 echo "Fixing swarm....(fixswarm.sh v$version)"
 
-[ -z $RG_HOME ] && RG_HOME='/opt/deploy/sp2'
+[ -z "$RG_HOME" ] && RG_HOME='/opt/deploy/sp2'
 echo "RG_HOME=$RG_HOME"
 
 # Remove the stack which is deployed if any
-cd "$RG_HOME"
 echo "Removing sp2 stack"
 docker stack remove sp2
-old_secrets=$(docker secret ls | grep -i sp2prod | awk '{print $1}' )
-if [ ! -z "$old_secrets" ]; then
-    echo "Found old secrets. Removing..."
-    docker secret rm $old_secrets
+old_secrets=$(docker secret ls | grep -i sp2prod | awk '{print $1}')
+if [ -n "$old_secrets" ]; then
+	echo "Found old secrets. Removing..."
+	echo "$old_secrets" |
+		while IFS=$'\n' read -r mysecret; do
+			docker secret rm "$mysecret"
+		done
 fi
 echo "Waiting 15 seconds"
 sleep 15
@@ -23,8 +25,10 @@ docker swarm leave --force
 
 # Remove the ingress network that is stuck
 echo "Removing the stuck ingress network"
-docker network ls | grep -e 'ingress.*overlay' | awk '{print $1}'
+docker network rm ingress
+#docker network ls | grep -e 'ingress.*overlay' | awk '{print $1}'
 
+# trunk-ignore(shellcheck/SC2181)
 [ $? -gt 0 ] && echo "Could not remove ingress network. Exiting" && exit 0
 
 echo "You can now re-deploy your stack using start_server.sh"