Skip to content

Commit 6e7782d

Browse files
committed
catkin -> python3 "$(command -v catkin)"
1 parent b03d090 commit 6e7782d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

setup/tue-functions.bash

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -437,12 +437,12 @@ function tue-make
437437
fi
438438
case $build_tool in
439439
'catkin build')
440-
catkin build --workspace "$TUE_SYSTEM_DIR" "$@"
440+
python3 "$(command -v catkin)" build --workspace "$TUE_SYSTEM_DIR" "$@"
441441
return $?
442442
;;
443443
'')
444-
catkin config --init --mkdirs --workspace "$TUE_SYSTEM_DIR" --extend /opt/ros/"$TUE_ROS_DISTRO" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCATKIN_ENABLE_TESTING=OFF
445-
catkin build --workspace "$TUE_SYSTEM_DIR" "$@"
444+
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
445+
python3 "$(command -v catkin)" build --workspace "$TUE_SYSTEM_DIR" "$@"
446446
touch "$TUE_SYSTEM_DIR"/devel/.catkin # hack to allow overlaying to this ws while being empty
447447
;;
448448
*)
@@ -488,7 +488,7 @@ function tue-make-test
488488
fi
489489
case ${build_tool} in
490490
'catkin build')
491-
catkin test --workspace "${TUE_SYSTEM_DIR}" "$@"
491+
python3 "$(command -v catkin)" test --workspace "${TUE_SYSTEM_DIR}" "$@"
492492
return $?
493493
;;
494494
'')
@@ -547,7 +547,7 @@ function tue-make-test-result
547547
fi
548548
case $build_tool in
549549
'catkin build')
550-
catkin test_results "${TUE_SYSTEM_DIR}"/build "$@"
550+
python3 "$(command -v catkin)" test_results "${TUE_SYSTEM_DIR}"/build "$@"
551551
return $?
552552
;;
553553
'')

0 commit comments

Comments
 (0)