From 785fbcc40d61979b4d6063c00937eaaae968d6d1 Mon Sep 17 00:00:00 2001 From: Andrew Jong Date: Mon, 13 Jan 2025 19:58:35 -0500 Subject: [PATCH] Fix auto bws if setup.bash doesn't exist --- ground_control_station/docker/docker-compose.yaml | 4 +++- robot/docker/robot-base-docker-compose.yaml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ground_control_station/docker/docker-compose.yaml b/ground_control_station/docker/docker-compose.yaml index de1d37dd2..2345ffbd0 100644 --- a/ground_control_station/docker/docker-compose.yaml +++ b/ground_control_station/docker/docker-compose.yaml @@ -11,7 +11,9 @@ services: command: > bash -c "ssh service restart; tmux new -d -s gcs_bringup - && tmux send-keys -t gcs_bringup 'ros2 launch gcs_bringup gcs.launch.xml' ENTER + && tmux send-keys -t gcs_bringup + 'if [ ! -f "/root/ros_ws/install/setup.bash" ]; then bws && sws; fi; + ros2 launch gcs_bringup gcs.launch.xml' ENTER && sleep infinity" # Interactive shell stdin_open: true # docker run -i diff --git a/robot/docker/robot-base-docker-compose.yaml b/robot/docker/robot-base-docker-compose.yaml index c7c60343d..176c49839 100644 --- a/robot/docker/robot-base-docker-compose.yaml +++ b/robot/docker/robot-base-docker-compose.yaml @@ -7,7 +7,7 @@ services: bash -c "ssh service restart; tmux new -d -s robot_bringup && tmux send-keys -t robot_bringup - 'if [ ! -d "~/ros_ws/install" ]; then bws && sws; fi; + 'if [ ! -f "/root/ros_ws/install/setup.bash" ]; then bws && sws; fi; ros2 launch robot_bringup robot.launch.xml' ENTER && sleep infinity" # Interactive shell