Fix checkout

usdot-fhwa-stol · Jan 4, 2023 · 09d0014 · 09d0014
1 parent 99614bf
commit 09d0014
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/docker/checkout.bash b/docker/checkout.bash
@@ -57,7 +57,8 @@ while [[ $# -gt 0 ]]; do
       esac
 done
 
-sudo rm -rf ${dir}/src/{CARMAMsgs,CARMAUtils}
+# Preemptively remove every possible dir this script clones to support ROS1 and ROS2 builds in sequence
+sudo rm -rf ${dir}/src/{automotive_autonomy_msgs,CARMAMsgs,CARMAUtils,dbw-mkz-ros,kvaser_interface,kvaser_interface,pacmod3,pacmod3_ros2,raptor-dbw-ros,raptor-dbw-ros2}
 
 if [[ "$BRANCH" = "develop" ]]; then
       git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch $BRANCH
@@ -70,27 +71,22 @@ fi
 if [ $build_ros1_pkgs -eq 1 ]; then
 
     # Required to build the dbw_pacifica_msgs message set.
-    sudo rm -rf ${dir}/src/raptor-dbw-ros
     sudo git clone https://github.com/NewEagleRaptor/raptor-dbw-ros.git ${dir}/src/raptor-dbw-ros --branch master 
     cd ${dir}/src/raptor-dbw-ros
     sudo git reset --hard f50f91cd88ad27b2ce05bab1f8ff780931c41475
 
     # Required for ford fusion drive by wire
-    sudo rm -rf ${dir}/src/dbw-mkz-ros
     sudo git clone https://bitbucket.org/DataspeedInc/dbw_mkz_ros.git ${dir}/src/dbw-mkz-ros --branch 1.2.4
 
-    sudo rm -rf ${dir}/src/pacmod3
     sudo git clone https://github.com/astuff/pacmod3.git ${dir}/src/pacmod3 --branch ros1_master
     cd ${dir}/src/pacmod3
     sudo git reset --hard 4e5e9cd5e821f4f19e31e10ba42f20449860b940
 
-    sudo rm -rf ${dir}/src/kvaser_interface
     sudo git clone https://github.com/astuff/kvaser_interface.git ${dir}/src/kvaser_interface --branch ros1_master
     cd ${dir}/src/kvaser_interface
     sudo git reset --hard e2aa169e32577f2468993b89edf7a0f67d1e7f0e
 
 elif [ $build_ros2_pkgs -eq 1 ]; then
-    sudo rm -rf ${dir}/src/raptor-dbw-ros2
     sudo git clone https://github.com/NewEagleRaptor/raptor-dbw-ros2.git ${dir}/src/raptor-dbw-ros2 --branch foxy
     cd ${dir}/src/raptor-dbw-ros2
     sudo git reset --hard 4ad958dd07bb9c7128dc75bc7397bc8f5be30a3c
@@ -100,19 +96,16 @@ elif [ $build_ros2_pkgs -eq 1 ]; then
     # sudo git clone https://bitbucket.org/DataspeedInc/dbw_mkz_ros.git ${dir}/src/dbw-mkz-ros --branch 1.2.4
 
     #Pacmod3
-    sudo rm -rf ${dir}/src/pacmod3_ros2
     sudo git clone https://github.com/astuff/pacmod3.git ${dir}/src/pacmod3_ros2 --branch ros2_master
     cd ${dir}/src/pacmod3_ros2
     sudo git reset --hard 159ef36f26726cf8d7f58e67add8c8319a67ae85
 
     # kvaser
-    sudo rm -rf ${dir}/src/kvaser_interface
     sudo git clone https://github.com/astuff/kvaser_interface.git ${dir}/src/kvaser_interface --branch ros2_master
     cd ${dir}/src/kvaser_interface
     sudo git reset --hard d7ea2fb82a1b61d0ce4c96d1422599f7ee6ed1b7
 
     # Install automotive_autonomy_msgs
-    sudo rm -rf ${dir}/src/automotive_autonomy_msgs
     sudo git clone https://github.com/astuff/automotive_autonomy_msgs.git ${dir}/src/automotive_autonomy_msgs --branch master
     cd ${dir}/src/automotive_autonomy_msgs
     sudo git reset --hard 191dce1827023bef6d69b31e8c2514cf82bf10c5