1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Thu, 26 May 2016 14:44:53 +0200
Subject: Always use catkin_find in rosrun
On Debian we are sure to have a catkin workspace, even though
CMAKE_PREFIX_PATH is not set. This fixes:
rosrun nodelet nodelet
---
tools/rosbash/scripts/rosrun | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/rosbash/scripts/rosrun b/tools/rosbash/scripts/rosrun
index e27899c..217b18d 100755
--- a/tools/rosbash/scripts/rosrun
+++ b/tools/rosbash/scripts/rosrun
@@ -47,12 +47,10 @@ case $2 in
;;
esac
-if [[ -n $CMAKE_PREFIX_PATH ]]; then
IFS=$'\n'
catkin_package_libexec_dirs=($(catkin_find --without-underlays --libexec --share "$1" 2> /dev/null))
unset IFS
debug "Looking in catkin libexec dirs: ${catkin_package_libexec_dirs[*]}"
-fi
pkgdir=$(rospack find "$1")
debug "Looking in rospack dir: $pkgdir"
if [[ ${#catkin_package_libexec_dirs[@]} -eq 0 && -z $pkgdir ]]; then
|
