csonto/bash-completion
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quoted $cur to prevent quoting

Browse Source 
See Alioth #311614, bash-completion.patch3
This commit is contained in:
Freddy Vulto 2009-09-25 21:30:45 +02:00
parent b66425e8cf
commit 32f22b996a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -175,8 +175,7 @@ bash-completion (1.x)
* Added setting COMP_KNOWN_HOSTS_WITH_HOSTFILE. _known_hosts_real() will add * Added setting COMP_KNOWN_HOSTS_WITH_HOSTFILE. _known_hosts_real() will add
hosts from HOSTFILE, unless COMP_KNOWN_HOSTS_WITH_HOSTFILE is set to an hosts from HOSTFILE, unless COMP_KNOWN_HOSTS_WITH_HOSTFILE is set to an
empty value (Alioth: #311821) empty value (Alioth: #311821)
* Fix _known_hosts_real() to not glob awk script - thanks to Eric Blake * Quoted $cur to prevent globbing - thanks to Eric Blake (Alioth #311614)
(Alioth #311614)
* Fix leaking $muttcmd from mutt completion * Fix leaking $muttcmd from mutt completion
* Fix completing multiple hosts (Debian: #535585) * Fix completing multiple hosts (Debian: #535585)

6
bash_completion
View File

@ -961,7 +961,7 @@ _insmod()
# do module parameter completion # do module parameter completion
COMPREPLY=( $( /sbin/modinfo -p ${COMP_WORDS[1]} 2>/dev/null | \ COMPREPLY=( $( /sbin/modinfo -p ${COMP_WORDS[1]} 2>/dev/null | \
awk '{if ($1 ~ /^parm:/ && $2 ~ /^'$cur'/) { print $2 } \ awk '{if ($1 ~ /^parm:/ && $2 ~ /^'$cur'/) { print $2 } \
else if ($1 !~ /:/ && $1 ~ /^'$cur'/) { print $1 }}' ) ) else if ($1 !~ /:/ && $1 ~ /^'"$cur"'/) { print $1 }}' ) )
else else
_modules $(uname -r) _modules $(uname -r)
fi fi
@ -1112,7 +1112,7 @@ _ipsec()
;; ;;
ranbits) ranbits)
COMPREPLY=( $( compgen -W '--quick --continuous --bytes' \ COMPREPLY=( $( compgen -W '--quick --continuous --bytes' \
-- $cur ) ) -- "$cur" ) )
;; ;;
setup) setup)
COMPREPLY=( $( compgen -W '--start --stop --restart' -- "$cur" ) ) COMPREPLY=( $( compgen -W '--start --stop --restart' -- "$cur" ) )
@ -1544,7 +1544,7 @@ _look()
cur=`_get_cword` cur=`_get_cword`
if [ $COMP_CWORD = 1 ]; then if [ $COMP_CWORD = 1 ]; then
COMPREPLY=( $( compgen -W '$(look $cur 2>/dev/null)' ) ) COMPREPLY=( $( compgen -W '$(look "$cur" 2>/dev/null)' ) )
fi fi
} && } &&
complete -F _look $default look complete -F _look $default look