From 9239771fce8561b9836a2c3cf49bd63b43a142e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20L=C3=BCdtke?= Date: Fri, 22 Sep 2017 13:00:44 +0200 Subject: [PATCH] do not expect a specific path to catkin --- industrial_ci/src/tests/source_tests.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/industrial_ci/src/tests/source_tests.sh b/industrial_ci/src/tests/source_tests.sh index d4d798082..a80dd3339 100644 --- a/industrial_ci/src/tests/source_tests.sh +++ b/industrial_ci/src/tests/source_tests.sh @@ -39,14 +39,11 @@ ROSWS=wstool ici_time_end # init_ici_environment function catkin { - PATH_CATKIN=/usr/bin/catkin - PKG_CATKIN=python-catkin-tools + local path + path=$(which catkin) || error "catkin not available. Make sure python-catkin-tools is installed. See also https://github.com/ros-industrial/industrial_ci/issues/216" local cmd=$1 shift - if [ ! -f ${PATH_CATKIN} ]; then - echo "[ERR] ${PATH_CATKIN} not available. Make sure ${PKG_CATKIN} is installed. See also https://github.com/ros-industrial/industrial_ci/issues/216"; - fi - /usr/bin/catkin "$cmd" -w "$CATKIN_WORKSPACE" "$@" + "$path" "$cmd" -w "$CATKIN_WORKSPACE" "$@" } ici_time_start setup_apt