Ensure we update with --rebase and that we are in the right directory.

107-systems · May 13, 2024 · 3743f0e · 3743f0e
1 parent f202a30
commit 3743f0e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/docker/run.sh b/docker/run.sh
@@ -6,12 +6,13 @@ if [ "$1" = "build" ]
 then
   echo "Rebuilding package robotem_rovne ..."
   cd src/robotem_rovne
-  git pull origin main
+  git pull origin main --rebase
   cd /tmp/colcon_ws
   colcon build --packages-select robotem_rovne
 elif [ "$1" = "run" ]
 then
   echo "Starting application robotem_rovne"
+  cd /tmp/colcon_ws
   . install/setup.sh
   ros2 launch robotem_rovne all.py
 else