[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-91-g22c8330
Ville Skyttä
ville.skytta at iki.fi
Wed Apr 20 14:20:00 UTC 2011
The following commit has been merged in the master branch:
commit 22c8330099fdda941ebebe08c8846b96a1f17be6
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Wed Apr 20 17:13:48 2011 +0300
Use _init_completion() in completions/i*.
diff --git a/completions/iconv b/completions/iconv
index 62446f6..8d85b3a 100644
--- a/completions/iconv
+++ b/completions/iconv
@@ -4,11 +4,10 @@ have iconv || return
_iconv()
{
- local cur prev split=false
-
- COMPREPLY=()
- _get_comp_words_by_ref cur prev
+ local cur prev words cword
+ _init_completion || return
+ local split=false
_split_longopt && split=true
case $prev in
diff --git a/completions/iftop b/completions/iftop
index e3f8e66..f972d91 100644
--- a/completions/iftop
+++ b/completions/iftop
@@ -4,9 +4,8 @@ have iftop || return
_iftop()
{
- COMPREPLY=()
- local cur prev
- _get_comp_words_by_ref cur prev
+ local cur prev words cword
+ _init_completion || return
case $prev in
-h|-f|-F|-m)
diff --git a/completions/ifupdown b/completions/ifupdown
index a2ffed4..372fe7b 100644
--- a/completions/ifupdown
+++ b/completions/ifupdown
@@ -4,10 +4,8 @@
_ifupdown()
{
- local cur
-
- COMPREPLY=()
- _get_comp_words_by_ref cur
+ local cur prev words cword
+ _init_completion || return
if [ $COMP_CWORD -eq 1 ]; then
_configured_interfaces
diff --git a/completions/imagemagick b/completions/imagemagick
index c1f91bd..998f376 100644
--- a/completions/imagemagick
+++ b/completions/imagemagick
@@ -4,9 +4,6 @@ have convert || return
_ImageMagick()
{
- local cur prev
- _get_comp_words_by_ref cur prev
-
case $prev in
-channel)
COMPREPLY=( $( compgen -W 'Red Green Blue Opacity \
@@ -133,10 +130,8 @@ _ImageMagick()
_convert()
{
- local cur
-
- COMPREPLY=()
- _get_comp_words_by_ref cur
+ local cur prev words cword
+ _init_completion || return
_ImageMagick
@@ -194,10 +189,8 @@ complete -F _convert convert
_mogrify()
{
- local cur
-
- COMPREPLY=()
- _get_comp_words_by_ref cur
+ local cur prev words cword
+ _init_completion || return
_ImageMagick
@@ -250,10 +243,8 @@ complete -F _mogrify mogrify
_display()
{
- local cur
-
- COMPREPLY=()
- _get_comp_words_by_ref cur
+ local cur prev words cword
+ _init_completion || return
_ImageMagick
@@ -290,10 +281,8 @@ complete -F _display display
_animate()
{
- local cur
-
- COMPREPLY=()
- _get_comp_words_by_ref cur
+ local cur prev words cword
+ _init_completion || return
_ImageMagick
@@ -324,10 +313,8 @@ complete -F _animate animate
_identify()
{
- local cur
-
- COMPREPLY=()
- _get_comp_words_by_ref cur
+ local cur prev words cword
+ _init_completion || return
_ImageMagick
@@ -349,10 +336,8 @@ complete -F _identify identify
_montage()
{
- local cur
-
- COMPREPLY=()
- _get_comp_words_by_ref cur
+ local cur prev words cword
+ _init_completion || return
_ImageMagick
@@ -387,10 +372,8 @@ complete -F _montage montage
_composite()
{
- local cur
-
- COMPREPLY=()
- _get_comp_words_by_ref cur
+ local cur prev words cword
+ _init_completion || return
_ImageMagick
@@ -422,10 +405,8 @@ complete -F _composite composite
_compare()
{
- local cur
-
- COMPREPLY=()
- _get_comp_words_by_ref cur
+ local cur prev words cword
+ _init_completion || return
_ImageMagick
@@ -449,10 +430,8 @@ complete -F _compare compare
_conjure()
{
- local cur
-
- COMPREPLY=()
- _get_comp_words_by_ref cur
+ local cur prev words cword
+ _init_completion || return
_ImageMagick
@@ -469,10 +448,8 @@ complete -F _conjure conjure
_import()
{
- local cur
-
- COMPREPLY=()
- _get_comp_words_by_ref cur
+ local cur prev words cword
+ _init_completion || return
_ImageMagick
@@ -500,10 +477,8 @@ complete -F _import import
_stream()
{
- local cur
-
- COMPREPLY=()
- _get_comp_words_by_ref cur
+ local cur prev words cword
+ _init_completion || return
_ImageMagick
diff --git a/completions/info b/completions/info
index b71d075..93d1f4a 100644
--- a/completions/info
+++ b/completions/info
@@ -4,10 +4,8 @@ have info || return
_info()
{
- local cur i infopath
-
- COMPREPLY=()
- _get_comp_words_by_ref cur
+ local cur prev words cword
+ _init_completion || return
_expand || return 0
@@ -17,7 +15,7 @@ _info()
return 0
fi
- infopath='/usr/share/info'
+ local i infopath=/usr/share/info
if [ "${INFOPATH: -1:1}" == ':' ]; then
infopath=${INFOPATH}${infopath}
diff --git a/completions/ipmitool b/completions/ipmitool
index 16933a4..121c9dd 100644
--- a/completions/ipmitool
+++ b/completions/ipmitool
@@ -10,10 +10,8 @@ _ipmitool_singleline_help()
_ipmitool()
{
- local cur prev
-
- COMPREPLY=()
- _get_comp_words_by_ref cur prev
+ local cur prev words cword
+ _init_completion || return
case $prev in
-h|-V|-p|-U|-e|-k|-y|-P|-m|-b|-t|-B|-T|-l)
@@ -74,10 +72,10 @@ _ipmitool()
sel pef sol tsol isol user channel session sunoem kontronoem picmg fwum
firewall shell exec set hpm ekanalyzer)
local i c cmd subcmd
- for (( i=1; i < ${#COMP_WORDS[@]}-1; i++ )); do
- [[ -n $cmd ]] && subcmd=${COMP_WORDS[i]} && break
+ for (( i=1; i < ${#words[@]}-1; i++ )); do
+ [[ -n $cmd ]] && subcmd=${words[i]} && break
for c in ${cmds[@]}; do
- [ ${COMP_WORDS[i]} = $c ] && cmd=$c && break
+ [ ${words[i]} = $c ] && cmd=$c && break
done
done
diff --git a/completions/iproute2 b/completions/iproute2
index 2a70543..c699a3f 100644
--- a/completions/iproute2
+++ b/completions/iproute2
@@ -4,9 +4,8 @@ have ip || return
_ip()
{
- COMPREPLY=()
local cur prev words cword
- _get_comp_words_by_ref cur prev words cword
+ _init_completion || return
case $prev in
-V|-Version|-rc|-rcvbuf)
diff --git a/completions/ipsec b/completions/ipsec
index f501747..4028053 100644
--- a/completions/ipsec
+++ b/completions/ipsec
@@ -4,20 +4,17 @@
_ipsec()
{
- local cur
+ local cur prev words cword
+ _init_completion || return
- COMPREPLY=()
- _get_comp_words_by_ref cur
-
-
- if [ $COMP_CWORD -eq 1 ]; then
+ if [ $cword -eq 1 ]; then
COMPREPLY=( $( compgen -W 'auto barf eroute klipsdebug look manual \
pluto ranbits rsasigkey setup showdefaults showhostkey spi spigrp \
tncfg whack' -- "$cur" ) )
return 0
fi
- case ${COMP_WORDS[1]} in
+ case ${words[1]} in
auto)
COMPREPLY=( $( compgen -W '--asynchronous --up --add --delete \
--replace --down --route --unroute \
diff --git a/completions/iptables b/completions/iptables
index 0a254f8..d717200 100644
--- a/completions/iptables
+++ b/completions/iptables
@@ -4,17 +4,16 @@ have iptables || return
_iptables()
{
- local cur prev table chain
+ local cur prev words cword
+ _init_completion || return
- COMPREPLY=()
- _get_comp_words_by_ref cur prev
- chain='s/^Chain \([^ ]\{1,\}\).*$/\1/p'
+ local table chain='s/^Chain \([^ ]\{1,\}\).*$/\1/p'
- if [[ $COMP_LINE == *-t\ *filter* ]]; then
+ if [[ ${words[@]} == *-t\ *filter* ]]; then
table="-t filter"
- elif [[ $COMP_LINE == *-t\ *nat* ]]; then
+ elif [[ ${words[@]} == *-t\ *nat* ]]; then
table="-t nat"
- elif [[ $COMP_LINE == *-t\ *mangle* ]]; then
+ elif [[ ${words[@]} == *-t\ *mangle* ]]; then
table="-t mangle"
fi
diff --git a/completions/ipv6calc b/completions/ipv6calc
index eb69963..04cb6ba 100644
--- a/completions/ipv6calc
+++ b/completions/ipv6calc
@@ -2,13 +2,10 @@ have ipv6calc || return
_ipv6calc()
{
- local cur prev split=false
-
- COMPREPLY=()
- _get_comp_words_by_ref -n = cur prev
- #cur=`_get_cword =`
- #prev=`_get_pword`
+ local cur prev words cword
+ _init_completion -n = || return
+ local split=false
_split_longopt && split=true
case "$prev" in
diff --git a/completions/isql b/completions/isql
index 4fda74e..59c393b 100644
--- a/completions/isql
+++ b/completions/isql
@@ -4,8 +4,8 @@ have isql || return
_isql()
{
- local cur
- _get_comp_words_by_ref cur
+ local cur prev words cword
+ _init_completion || return
[ -f "$ODBCINI" ] \
&& COMPREPLY=( $( command grep \\["$cur" "$ODBCINI" | tr -d \\[\\] ) )
--
bash-completion
More information about the Bash-completion-commits
mailing list