p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

roszsh: blind change to fix bad uses of ROS_ROOT (commands look out of date as they are pre-ROS_HOME logic

This commit is contained in:
Ken Conley 2012-01-07 00:18:09 +00:00
parent ef6fca9423
commit 26fd3f4765
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/rosbash/roszsh
View File

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