[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-115-g6e809d0
Ville Skyttä
ville.skytta at iki.fi
Sun Apr 24 21:11:37 UTC 2011
The following commit has been merged in the master branch:
commit 6e809d032ce713ab70b640d6ec29688d758076e3
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Mon Apr 25 00:09:50 2011 +0300
Remove = from COMP_WORDBREAKS when using _split_longopt().
Without this, it does not do anything useful in bash >= 4.0.
diff --git a/bash_completion b/bash_completion
index f1def50..3542397 100644
--- a/bash_completion
+++ b/bash_completion
@@ -649,6 +649,8 @@ _filedir()
# This function splits $cur=--foo=bar into $prev=--foo, $cur=bar, making it
# easier to support both "--foo bar" and "--foo=bar" style completions.
+# `=' should have been removed from COMP_WORDBREAKS when setting $cur for
+# this to be useful.
# Returns 0 if current option was split, 1 otherwise.
#
_split_longopt()
diff --git a/completions/_mock b/completions/_mock
index 171732f..f082ac7 100644
--- a/completions/_mock
+++ b/completions/_mock
@@ -8,7 +8,7 @@ have mock || return
_mock()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local plugins='tmpfs root_cache yum_cache bind_mount ccache'
local cfgdir=/etc/mock count=0 i
diff --git a/completions/_yum b/completions/_yum
index ca56127..063b982 100644
--- a/completions/_yum
+++ b/completions/_yum
@@ -38,7 +38,7 @@ _yum_plugins()
_yum()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local special i
for (( i=0; i < ${#words[@]}-1; i++ )); do
diff --git a/completions/aspell b/completions/aspell
index 17fadf3..ef3698c 100644
--- a/completions/aspell
+++ b/completions/aspell
@@ -18,7 +18,7 @@ _aspell_dictionary()
_aspell()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/autoconf b/completions/autoconf
index 10d80cf..05d671a 100644
--- a/completions/autoconf
+++ b/completions/autoconf
@@ -4,7 +4,7 @@ have autoconf &&
_autoconf()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -44,7 +44,7 @@ have autoreconf || have autoheader &&
_autoreconf()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -85,7 +85,7 @@ have autoscan || have autoupdate &&
_autoscan()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/automake b/completions/automake
index 19a49f3..0f93ea5 100644
--- a/completions/automake
+++ b/completions/automake
@@ -4,7 +4,7 @@ have automake &&
_automake()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -40,7 +40,7 @@ have aclocal &&
_aclocal()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/bluez b/completions/bluez
index 82f66df..c97644a 100644
--- a/completions/bluez
+++ b/completions/bluez
@@ -32,7 +32,7 @@ _bluetooth_packet_types()
_hcitool()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -114,7 +114,7 @@ complete -F _hcitool hcitool
_sdptool()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/chkconfig b/completions/chkconfig
index 941890a..37941d4 100644
--- a/completions/chkconfig
+++ b/completions/chkconfig
@@ -5,7 +5,7 @@ have chkconfig || return
_chkconfig()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/configure b/completions/configure
index a8afb1c..bca6777 100644
--- a/completions/configure
+++ b/completions/configure
@@ -5,7 +5,7 @@
_configure()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/coreutils b/completions/coreutils
index 97fe96a..ef38bc4 100644
--- a/completions/coreutils
+++ b/completions/coreutils
@@ -7,7 +7,7 @@ _chown()
{
local cur prev words cword
# Don't treat user:group as separate words.
- _init_completion -n : || return
+ _init_completion -n := || return
local split=false
_split_longopt && split=true
@@ -56,7 +56,7 @@ have chgrp &&
_chgrp()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
cur=${cur//\\\\/}
@@ -116,7 +116,7 @@ have mktemp &&
_mktemp()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/cpio b/completions/cpio
index 71743b0..a2511ea 100644
--- a/completions/cpio
+++ b/completions/cpio
@@ -10,7 +10,7 @@ _cpio_format()
_cpio()
{
local cur prev words cword
- _init_completion -n : || return
+ _init_completion -n := || return
local split=false
_split_longopt && split=true
diff --git a/completions/dpkg b/completions/dpkg
index 7dd8b0b..68daa54 100644
--- a/completions/dpkg
+++ b/completions/dpkg
@@ -21,7 +21,7 @@ _comp_dpkg_installed_packages()
_dpkg()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
_expand || return 0
diff --git a/completions/heimdal b/completions/heimdal
index e909d8c..2cea5e0 100644
--- a/completions/heimdal
+++ b/completions/heimdal
@@ -24,7 +24,7 @@ _heimdal_encodings()
_ktutil()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local command options split=false
diff --git a/completions/iconv b/completions/iconv
index 8d85b3a..c0216af 100644
--- a/completions/iconv
+++ b/completions/iconv
@@ -5,7 +5,7 @@ have iconv || return
_iconv()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/iptables b/completions/iptables
index d717200..8cd82c1 100644
--- a/completions/iptables
+++ b/completions/iptables
@@ -5,7 +5,7 @@ have iptables || return
_iptables()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local table chain='s/^Chain \([^ ]\{1,\}\).*$/\1/p'
diff --git a/completions/mailman b/completions/mailman
index 457ac33..944748d 100644
--- a/completions/mailman
+++ b/completions/mailman
@@ -24,7 +24,7 @@ have add_members &&
_add_members()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -57,7 +57,7 @@ have remove_members &&
_remove_members()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -85,7 +85,7 @@ have find_member &&
_find_member()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -111,7 +111,7 @@ have clone_member &&
_clone_member()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -137,7 +137,7 @@ have sync_members &&
_sync_members()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -215,7 +215,7 @@ have list_members &&
_list_members()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -252,7 +252,7 @@ have change_pw &&
_change_pw()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -324,7 +324,7 @@ have config_list &&
_config_list()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -354,7 +354,7 @@ have arch && have mailmanctl &&
_arch()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -413,7 +413,7 @@ have inject &&
_inject()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -510,7 +510,7 @@ have qrunner &&
_qrunner()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
_split_longopt && return 0
diff --git a/completions/make b/completions/make
index e06aa98..c598a02 100644
--- a/completions/make
+++ b/completions/make
@@ -5,7 +5,7 @@ have make || have gmake || have gnumake || have pmake || return
_make()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local file makef makef_dir="." makef_inc i split=false
diff --git a/completions/mc b/completions/mc
index e7b5762..3426742 100644
--- a/completions/mc
+++ b/completions/mc
@@ -5,7 +5,7 @@ have mc || return
_mc()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/mdadm b/completions/mdadm
index 2232468..3660aed 100644
--- a/completions/mdadm
+++ b/completions/mdadm
@@ -73,7 +73,7 @@ _mdadm_update_flag()
_mdadm()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/mkinitrd b/completions/mkinitrd
index d5cc025..5827fc0 100644
--- a/completions/mkinitrd
+++ b/completions/mkinitrd
@@ -5,7 +5,7 @@ have mkinitrd || return
_mkinitrd()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/mysqladmin b/completions/mysqladmin
index 1e86117..cebe9f0 100644
--- a/completions/mysqladmin
+++ b/completions/mysqladmin
@@ -5,7 +5,7 @@ have mysqladmin || return
_mysqladmin()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/net-tools b/completions/net-tools
index 9cdb465..bb9337c 100644
--- a/completions/net-tools
+++ b/completions/net-tools
@@ -4,7 +4,7 @@ have mii-tool &&
_mii_tool()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -37,7 +37,7 @@ have mii-diag &&
_mii_diag()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/open-iscsi b/completions/open-iscsi
index 0d01ca1..8f91354 100644
--- a/completions/open-iscsi
+++ b/completions/open-iscsi
@@ -5,7 +5,7 @@ have iscsiadm || return
_iscsiadm()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/pkg-config b/completions/pkg-config
index 4d21af4..ff665c2 100644
--- a/completions/pkg-config
+++ b/completions/pkg-config
@@ -5,7 +5,7 @@ have pkg-config || return
_pkg_config()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/postgresql b/completions/postgresql
index 239c92f..bbb3ce0 100644
--- a/completions/postgresql
+++ b/completions/postgresql
@@ -23,7 +23,7 @@ _pg_users()
_createdb()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -64,7 +64,7 @@ complete -F _createdb -o default createdb
_dropdb()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -100,7 +100,7 @@ complete -F _dropdb -o default dropdb
_psql()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/quota-tools b/completions/quota-tools
index bc06607..5aa4039 100644
--- a/completions/quota-tools
+++ b/completions/quota-tools
@@ -34,7 +34,7 @@ _filesystems()
_quota()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -62,7 +62,7 @@ complete -F _quota -o default quota
_setquota()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -100,7 +100,7 @@ complete -F _setquota -o default setquota
_edquota()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -131,7 +131,7 @@ complete -F _edquota -o default edquota
_quotacheck()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -159,7 +159,7 @@ complete -F _quotacheck -o default quotacheck
_repquota()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -187,7 +187,7 @@ complete -F _repquota -o default repquota
_quotaon()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -213,7 +213,7 @@ complete -F _quotaon -o default quotaon
_quotaoff()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/reportbug b/completions/reportbug
index 223bcf3..c9d750f 100644
--- a/completions/reportbug
+++ b/completions/reportbug
@@ -88,7 +88,7 @@ have querybts &&
_querybts()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/rpm b/completions/rpm
index 354e3e8..9c32f95 100644
--- a/completions/rpm
+++ b/completions/rpm
@@ -40,7 +40,7 @@ _rpm_macros()
_rpm()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
if [ $cword -eq 1 ]; then
# first parameter on line
@@ -57,10 +57,12 @@ _rpm()
-- "$cur" ) )
;;
esac
-
- return 0
+ return 0
fi
+ local split=false
+ _split_longopt && split=true
+
case $prev in
--dbpath|--excludepath|--prefix|--relocate|--root)
_filedir -d
@@ -114,6 +116,8 @@ _rpm()
;;
esac
+ $split && return 0
+
# options common to all modes
local opts="--define --eval --macros --nodigest --nosignature --rcfile \
--quiet --pipe --verbose"
@@ -230,7 +234,7 @@ complete -F _rpm rpm
_rpmbuild()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/rtcwake b/completions/rtcwake
index 7cfb49b..24cd9c1 100644
--- a/completions/rtcwake
+++ b/completions/rtcwake
@@ -5,7 +5,7 @@ have rtcwake || return
_rtcwake()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/samba b/completions/samba
index a08b9ee..30cb375 100644
--- a/completions/samba
+++ b/completions/samba
@@ -31,7 +31,7 @@ _samba_debuglevel()
_smbclient()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -96,7 +96,7 @@ complete -F _smbclient smbclient
_smbget()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -127,7 +127,7 @@ complete -F _smbget smbget
_smbcacls()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -159,7 +159,7 @@ complete -F _smbcacls smbcacls
_smbcquotas()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -250,7 +250,7 @@ complete -F _smbtar smbtar
_smbtree()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/shadow b/completions/shadow
index 82bdf52..31ed80d 100644
--- a/completions/shadow
+++ b/completions/shadow
@@ -4,7 +4,7 @@ have useradd &&
_useradd()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -54,7 +54,7 @@ have usermod &&
_usermod()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -117,7 +117,7 @@ have chage &&
_chage()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -167,7 +167,7 @@ have chpasswd &&
_chpasswd()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -197,7 +197,7 @@ have newusers &&
_newusers()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -244,7 +244,7 @@ have groupadd &&
_groupadd()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -272,7 +272,7 @@ have groupmod &&
_groupmod()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -399,7 +399,7 @@ have faillog &&
_faillog()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
@@ -428,7 +428,7 @@ have lastlog &&
_lastlog()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/smartctl b/completions/smartctl
index 2b93a15..e48b3b7 100644
--- a/completions/smartctl
+++ b/completions/smartctl
@@ -106,7 +106,7 @@ _smartctl_drivedb()
_smartctl()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local split=false
_split_longopt && split=true
diff --git a/completions/sysbench b/completions/sysbench
index 06aa575..12fed76 100644
--- a/completions/sysbench
+++ b/completions/sysbench
@@ -7,8 +7,6 @@ _sysbench()
local cur prev words cword
_init_completion -n = || return
- # long options need the "=" (whitespace split doesn't work), but we split
- # internally to make processing easier
local split=false
_split_longopt && split=true
@@ -121,6 +119,9 @@ _sysbench()
fi
done
+ # Long options need the "=" (whitespace split doesn't work), so we
+ # include it in completions that require a value.
+
local opts="--num-threads= --max-requests= --max-time= --thread-stack-size=
--init-rng= --debug= --validate= --help --version"
diff --git a/completions/tar b/completions/tar
index b802133..36f057f 100644
--- a/completions/tar
+++ b/completions/tar
@@ -5,7 +5,7 @@ have tar || return
_tar()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
local ext regex tar untar
diff --git a/completions/wol b/completions/wol
index ce8e629..107cba5 100644
--- a/completions/wol
+++ b/completions/wol
@@ -5,7 +5,7 @@ have wol || return
_wol()
{
local cur prev words cword
- _init_completion -n : || return
+ _init_completion -n := || return
local split=false
_split_longopt && split=true
diff --git a/completions/xz b/completions/xz
index 96e1a0a..28d0e48 100644
--- a/completions/xz
+++ b/completions/xz
@@ -4,7 +4,10 @@ have xz || have pxz &&
_xz()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
+
+ local split=false
+ _split_longopt && split=true
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--compress --decompress --test --list \
@@ -16,9 +19,6 @@ _xz()
return 0
fi
- local split=false
- _split_longopt && split=true
-
local xspec="*.@(xz|lzma|txz|tlz)"
case $prev in
@@ -64,7 +64,7 @@ have xzdec &&
_xzdec()
{
local cur prev words cword
- _init_completion || return
+ _init_completion -n = || return
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--memory --quiet --help --version' \
--
bash-completion
More information about the Bash-completion-commits
mailing list