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

robash find regex problems on OSX #3864

This commit is contained in:
Thibault Kruse 2012-02-23 21:08:29 +00:00
parent cd49665d40
commit 2392c6eb22
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/rosbash/rosbash
View File

@ -448,11 +448,13 @@ function _roscomplete_file {
}
function _roscomplete_launch {
_roscomplete_search_dir "-type f -regex .*\.launch$\|.*\.test$"
arg="${COMP_WORDS[COMP_CWORD]}"
COMPREPLY=()
if [[ ${arg} =~ \-\-.* ]]; then
COMPREPLY=(${COMPREPLY[@]} $(compgen -W "--files --args --nodes --find-node --child --local --screen --server_uri --run_id --wait --port --core --pid --dump-params" -- ${arg}))
else
_roscomplete_search_dir "( -name *.launch -o -name *.test ) -type f"
if [[ $COMP_CWORD == 1 ]]; then
COMPREPLY=($(compgen -o plusdirs -f -X "!*.launch" -- ${arg}) ${COMPREPLY[@]} $(compgen -o plusdirs -f -X "!*.test" -- ${arg}) ${COMPREPLY[@]})
fi
@ -460,11 +462,11 @@ function _roscomplete_launch {
}
function _roscomplete_test {
_roscomplete_search_dir "-type f -regex .*\.launch$\|.*\.test$"
arg="${COMP_WORDS[COMP_CWORD]}"
if [[ ${arg} =~ \-\-.* ]]; then
COMPREPLY=(${COMPREPLY[@]} $(compgen -W "--bare --bare-limit --bare-name --pkgdir --package" -- ${arg}))
else
_roscomplete_search_dir "( -name *.launch -o -name *.test ) -type f"
if [[ $COMP_CWORD == 1 ]]; then
COMPREPLY=($(compgen -o plusdirs -f -X "!*.launch" -- ${arg}) ${COMPREPLY[@]} $(compgen -o plusdirs -f -X "!*.test" -- ${arg}) ${COMPREPLY[@]})
fi

2
tools/rosbash/roszsh
View File

@ -252,7 +252,7 @@ function _roscomplete_file {
}
function _roscomplete_launchfile {
_roscomplete_search_dir "-type f -regex .*\.launch$\|.*\.test$"
_roscomplete_search_dir "( -name *.launch -o -name *.test ) -type f"
}
function _roscomplete_rosbag {