From 16d66a277bf527c45f444c17b0be781d081b80fa Mon Sep 17 00:00:00 2001
From: Dirk Thomas <dthomas@willowgarage.com>
Date: Sun, 16 Sep 2012 20:28:27 +0000
Subject: [PATCH] updated to use CMAKE_PREFIX_PATH instead of CATKIN_WORKSPACES

---
 env-hooks/10.ros.sh.in       | 22 ++++++++++++++--------
 tools/rosbash/rosbash        |  4 ++--
 tools/rosbash/scripts/rosrun |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/env-hooks/10.ros.sh.in b/env-hooks/10.ros.sh.in
index 376921d8..85a31c99 100644
--- a/env-hooks/10.ros.sh.in
+++ b/env-hooks/10.ros.sh.in
@@ -12,16 +12,22 @@ fi
 PYTHON_CODE_BUILD_ROS_PACKAGE_PATH=$(cat <<EOF
 from __future__ import print_function
 import os
-env_name = 'CATKIN_WORKSPACES'
-items = os.environ[env_name].split(';') if env_name in os.environ and os.environ[env_name] != '' else []
+env_name = 'CMAKE_PREFIX_PATH'
+paths = [path for path in os.environ[env_name].split(os.pathsep)] if env_name in os.environ and os.environ[env_name] != '' else []
+workspaces = [path for path in paths if os.path.exists(os.path.join(path, '.CATKIN_WORKSPACE'))]
 paths = []
-for item in items:
-    if item.find(':') != -1:
-        paths.append(item.split(':')[1])
+for workspace in workspaces:
+    filename = os.path.join(workspace, '.CATKIN_WORKSPACE')
+    data = ''
+    with open(filename) as f:
+        data = f.read()
+    if data == '':
+        paths.append(os.path.join(workspace, 'share'))
+        paths.append(os.path.join(workspace, 'stacks'))
     else:
-        paths.append(os.path.join(item, 'share'))
-        paths.append(os.path.join(item, 'stacks'))
-print(':'.join(paths))
+        for source_path in data.split(';'):
+            paths.append(source_path)
+print(os.pathsep.join(paths))
 EOF
 )
 export ROS_PACKAGE_PATH=`python -c "$PYTHON_CODE_BUILD_ROS_PACKAGE_PATH"`
diff --git a/tools/rosbash/rosbash b/tools/rosbash/rosbash
index 5c749ee9..f2d6c244 100644
--- a/tools/rosbash/rosbash
+++ b/tools/rosbash/rosbash
@@ -220,7 +220,7 @@ function rosls {
 # sets arg as return value
 function _roscmd {
     local pkgdir exepath opt catkin_project_libexec_dir opts
-    if [[ -n $CATKIN_WORKSPACES ]]; then
+    if [[ -n $CMAKE_PREFIX_PATH ]]; then
         catkin_project_libexec_dir=`catkin_find --first-only --libexec $1 2> /dev/null`
     fi
     pkgdir=`_ros_package_find $1`
@@ -417,7 +417,7 @@ function _roscomplete_search_dir {
         COMPREPLY=($(compgen -W "${opts}" -- ${arg}))
         unset IFS
     elif [[ $COMP_CWORD == 2 ]]; then
-        if [[ -n $CATKIN_WORKSPACES ]]; then
+        if [[ -n $CMAKE_PREFIX_PATH ]]; then
             catkin_project_libexec_dir=`catkin_find --first-only --libexec ${COMP_WORDS[1]} 2> /dev/null`
         fi
         pkgdir=`_ros_package_find ${COMP_WORDS[1]}`
diff --git a/tools/rosbash/scripts/rosrun b/tools/rosbash/scripts/rosrun
index a3945831..18dc6867 100755
--- a/tools/rosbash/scripts/rosrun
+++ b/tools/rosbash/scripts/rosrun
@@ -21,7 +21,7 @@ case $2 in
 esac 
 # basename also makes .//foo into foo 
 basename=`basename $2`
-if [[ -n $CATKIN_WORKSPACES ]]; then
+if [[ -n $CMAKE_PREFIX_PATH ]]; then
     catkin_project_libexec_dir=`catkin_find --first-only --libexec $1 2> /dev/null`
 fi
 pkgdir=`rospack find $1`