From 26fd3f4765f98496166c1ce9d662631bf4c7a2d9 Mon Sep 17 00:00:00 2001
From: Ken Conley <kwc@kwc.org>
Date: Sat, 7 Jan 2012 00:18:09 +0000
Subject: [PATCH] roszsh: blind change to fix bad uses of ROS_ROOT (commands
 look out of date as they are pre-ROS_HOME logic

---
 tools/rosbash/roszsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/rosbash/roszsh b/tools/rosbash/roszsh
index ab3c7390..60622c1c 100644
--- a/tools/rosbash/roszsh
+++ b/tools/rosbash/roszsh
@@ -20,13 +20,13 @@ function _ros_decode_path {
     fi
 
     if [[ $rosname == ros ]]; then
-        rosdir=${ROS_ROOT}
+        rosdir=`rosstack find ros`
     elif [[ $rosname == pkg ]]; then
         rosdir=${ROS_PACKAGE_PATH%%:*}
     elif [[ $rosname == log ]]; then
-        rosdir=${ROS_ROOT}/log
+        rosdir=`roslaunch-logs`
     elif [[ $rosname == test_results ]]; then
-        rosdir=${ROS_ROOT}/test/test_results
+        rosdir=`rosrun rosunit test_results_dir.py`
     else
         rospackdir=`export ROS_CACHE_TIMEOUT=-1.0 && rospack find $rosname 2> /dev/null`
         rospack_result=$?