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

rostopic pub autocomplete's works when options are provided

This commit is contained in:
Javier 2016-11-15 17:33:27 -03:00 committed by Dirk Thomas
parent 58acf513df
commit e2c45e7269
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/rosbash/rosbash
View File

@ -776,17 +776,37 @@ function _roscomplete_rostopic {
COMPREPLY=($(compgen -W "$opts" -- ${arg})) COMPREPLY=($(compgen -W "$opts" -- ${arg}))
;; ;;
pub) pub)
if [[ $COMP_CWORD == 2 ]]; then local topic_pos type_pos msg_pos
topic_pos=2
type_pos=3
msg_pos=4
while [ $topic_pos -lt ${#COMP_WORDS[*]} ]; do
if [[ ${COMP_WORDS[$topic_pos]} =~ \-.* ]]; then
# ignore any options starting with -
if [[ ${COMP_WORDS[$topic_pos]} == "-f" || ${COMP_WORDS[$topic_pos]} == "-r" ]]; then
# ignore additional argument of -f and -r
topic_pos=$((topic_pos + 1))
type_pos=$((type_pos + 1))
msg_pos=$((msg_pos + 1))
fi
topic_pos=$((topic_pos + 1))
type_pos=$((type_pos + 1))
msg_pos=$((msg_pos + 1))
else
break
fi
done
if [[ $COMP_CWORD == $topic_pos ]]; then
opts=`rostopic list 2> /dev/null` opts=`rostopic list 2> /dev/null`
COMPREPLY=($(compgen -W "$opts" -- ${arg})) COMPREPLY=($(compgen -W "$opts" -- ${arg}))
elif [[ $COMP_CWORD == 3 ]]; then elif [[ $COMP_CWORD == $type_pos ]]; then
opts=$(rostopic info ${COMP_WORDS[$COMP_CWORD-1]} 2> /dev/null | awk '/Type:/{print $2}') opts=$(rostopic info ${COMP_WORDS[$COMP_CWORD-1]} 2> /dev/null | awk '/Type:/{print $2}')
if [ -z "$opts" ]; then if [ -z "$opts" ]; then
opts=`_msg_opts ${COMP_WORDS[$COMP_CWORD]}` opts=`_msg_opts ${COMP_WORDS[$COMP_CWORD]}`
fi fi
COMPREPLY=($(compgen -W "$opts" -- ${arg})) COMPREPLY=($(compgen -W "$opts" -- ${arg}))
elif [[ $COMP_CWORD == 4 ]]; then elif [[ $COMP_CWORD == $msg_pos ]]; then
opts=`rosmsg-proto msg 2> /dev/null -s ${COMP_WORDS[3]}` opts=`rosmsg-proto msg 2> /dev/null -s ${COMP_WORDS[$COMP_CWORD - 1]}`
if [ 0 -eq $? ]; then if [ 0 -eq $? ]; then
COMPREPLY="$opts" COMPREPLY="$opts"
fi fi