fix launch.sh exit code

Signed-off-by: Daisuke Sato <[email protected]>

launch.sh

@@ -232,8 +232,8 @@ cd $scriptdir
 dcfile=
 
 dcfile=docker-compose
-if [ $simulation -eq 0 ]; then dcfile="${dcfile}-production"; fi
-if [ $CABOT_HEADLESS -eq 1 ]; then dcfile="${dcfile}-headless"; fi
+if [[ $simulation -eq 0 ]]; then dcfile="${dcfile}-production"; fi
+if [[ $CABOT_HEADLESS -eq 1 ]]; then dcfile="${dcfile}-headless"; fi
 dcfile="${dcfile}.yaml"
 
 if [ ! -e $dcfile ]; then
@@ -243,12 +243,8 @@ fi
 
 dccom="docker compose -f $dcfile"
 
-
-if [[ $CABOT_HEADLESS -eq 1 ]]; then
-    ./server-launch.sh -c -p $CABOT_SITE
-else
-    gnome-terminal -- bash -c "./server-launch.sh -c -p $CABOT_SITE -v; exit"
-fi
+## launch server
+./server-launch.sh -c -p $CABOT_SITE
 
 if [ $verbose -eq 0 ]; then
     com2="bash -c \"setsid $dccom --ansi never up --no-build --abort-on-container-exit\" > $host_ros_log_dir/docker-compose.log &"
@@ -282,7 +278,7 @@ if [[ $run_test -eq 1 ]]; then
     else
         docker compose exec navigation /home/developer/ros2_ws/script/run_test.sh -w $module $test_func
     fi
-    exit $?
+    ctrl_c $?
 fi
 
 while [ 1 -eq 1 ];

script/run_test.sh

@@ -4,7 +4,7 @@ trap ctrl_c INT QUIT TERM
 
 function ctrl_c() {
     echo "Test terminated"
-    exit 0
+    exit $1
 }
 
 function err {

server-launch.sh

@@ -115,9 +115,11 @@ mkdir -p $temp_dir
 if [[ $clean_server -eq 2 ]]; then
     blue "Clean servers"
     for service in "map_server" "map_data" "mongodb"; do
-        if [[ ! -z $(docker ps -f "name=$server" -q -a) ]]; then
-	    docker ps -f "name=$server" -q -a | xargs docker stop
-	    docker ps -f "name=$server" -q -a | xargs docker container rm
+        if [[ ! -z $(docker ps -f "name=$service" -q -a) ]]; then
+	    blue "stopping $service"
+	    docker ps -f "name=$service"
+	    docker ps -f "name=$service" -q -a | xargs docker stop
+	    docker ps -f "name=$service" -q -a | xargs docker container rm
         fi
     done
     exit 0