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

fix zsh whitespace after package name for completion of rostopic pub

This commit is contained in:
Thibault Kruse 2012-02-17 07:17:25 +00:00
parent 91f6583be5
commit ed3c9a6e0e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/rosbash/roszsh
View File

@ -421,7 +421,11 @@ function _roscomplete_rostopic {
opts=`rostopic list 2> /dev/null` opts=`rostopic list 2> /dev/null`
reply=(${=opts}) reply=(${=opts})
elif [[ ${CURRENT} == 4 ]]; then elif [[ ${CURRENT} == 4 ]]; then
opts=`_msg_opts ${=${(s: :)words[-1]}}` if [[ ${=${(s: :)words}[$(( ${CURRENT} ))]} =~ / ]]; then
opts=`_msg_opts ${=${(s: :)words[-1]}} | sed -s 's/.*\///'`
else
opts=`_msg_opts ${=${(s: :)words[-1]}}`
fi
reply=(${=opts}) reply=(${=opts})
elif [[ ${CURRENT} == 5 ]]; then elif [[ ${CURRENT} == 5 ]]; then
opts=`rosmsg-proto msg -s ${=${(s: :)words[-1]}}` opts=`rosmsg-proto msg -s ${=${(s: :)words[-1]}}`
@ -614,7 +618,7 @@ compctl -K "_roscomplete_rospack" "rospack"
compctl -K "_roscomplete_rosbag" "rosbag" compctl -K "_roscomplete_rosbag" "rosbag"
compctl -K "_roscomplete_rosnode" "rosnode" compctl -K "_roscomplete_rosnode" "rosnode"
compctl -K "_roscomplete_rosparam" "rosparam" compctl -K "_roscomplete_rosparam" "rosparam"
compctl -K "_roscomplete_rostopic" "rostopic" compctl -x 'p[0,2]' -K "_roscomplete_rostopic" - 'n[1,/] p[3]' -K "_roscomplete_rostopic" - 'p[3]' -S '' -K "_roscomplete_rostopic" - 'p[4]' -K "_roscomplete_rostopic" -- "rostopic"
compctl -K "_roscomplete_rosservice" "rosservice" compctl -K "_roscomplete_rosservice" "rosservice"
compctl -x 'p[1]' -k "(md5 package packages show users)" - 'p[2]' -S '' -K "_roscomplete_rosmsg" -- "rosmsg" compctl -x 'p[1]' -k "(md5 package packages show users)" - 'p[2]' -S '' -K "_roscomplete_rosmsg" -- "rosmsg"
compctl -x 'p[1]' -k "(md5 package packages show users)" - 'p[2]' -S '' -K "_roscomplete_rossrv" -- "rossrv" compctl -x 'p[1]' -k "(md5 package packages show users)" - 'p[2]' -S '' -K "_roscomplete_rossrv" -- "rossrv"