catkin -> python3 "$(command -v catkin)"

tue-robotics · Dec 5, 2023 · a84e7c9 · a84e7c9
1 parent bcc4baa
commit a84e7c9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ros-rosbridge_suite/install.bash b/ros-rosbridge_suite/install.bash
@@ -12,7 +12,7 @@ then
     tue-install-debug "Source pkg found in the workspace, removing it, so the system installed version is used"
     tue-install-pipe rm "$TUE_SYSTEM_DIR/src/${pkg}"
 
-    tue-install-pipe catkin clean --workspace "${TUE_SYSTEM_DIR}" --orphans
+    tue-install-pipe python3 "$(command -v catkin)" clean --workspace "${TUE_SYSTEM_DIR}" --orphans
 else
     tue-install-debug "Source pkg already removed"
 fi

diff --git a/tue-documentation/setup b/tue-documentation/setup
@@ -17,11 +17,11 @@ function tue-make-documentation
         fi
         case $build_tool in
         'catkin build')
-            catkin document --workspace "$TUE_SYSTEM_DIR" "$@"
+            python3 "$(command -v catkin)" document --workspace "$TUE_SYSTEM_DIR" "$@"
             ;;
         '')
-            catkin config --init --mkdirs --workspace "$TUE_SYSTEM_DIR" --extend /opt/ros/"$TUE_ROS_DISTRO" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCATKIN_ENABLE_TESTING=OFF
-            catkin document --workspace "$TUE_SYSTEM_DIR" "$@"
+            python3 "$(command -v catkin)" config --init --mkdirs --workspace "$TUE_SYSTEM_DIR" --extend /opt/ros/"$TUE_ROS_DISTRO" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCATKIN_ENABLE_TESTING=OFF
+            python3 "$(command -v catkin)" document --workspace "$TUE_SYSTEM_DIR" "$@"
             touch "$TUE_SYSTEM_DIR"/devel/.catkin # hack to allow overlaying to this ws while being empty
             ;;
         *)

diff --git a/vscode/install.bash b/vscode/install.bash
@@ -24,9 +24,9 @@ else
 fi
 
 # Install and configure catkin tools extension
-if ! catkin config --workspace "$TUE_SYSTEM_DIR" | grep -q "DCMAKE_EXPORT_COMPILE_COMMANDS"
+if ! python3 "$(command -v catkin)" config --workspace "$TUE_SYSTEM_DIR" | grep -q "DCMAKE_EXPORT_COMPILE_COMMANDS"
 then
-    catkin config --workspace "$TUE_SYSTEM_DIR" --append-args -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+    python3 "$(command -v catkin)" config --workspace "$TUE_SYSTEM_DIR" --append-args -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 fi
 
 # Configure to build only active package