From e061eb5a390c73f412219ebbf82360d37aaa8622 Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Sun, 11 Sep 2022 09:39:23 +0900 Subject: [PATCH 1/4] refactor: "_initialize_completion => _comp_initialize" --- bash_completion | 18 +++--- completions/2to3 | 2 +- completions/7z | 2 +- completions/_adb | 2 +- completions/_cal | 2 +- completions/_chsh | 2 +- completions/_dmesg | 2 +- completions/_eject | 2 +- completions/_hexdump | 2 +- completions/_hwclock | 2 +- completions/_ionice | 2 +- completions/_look | 2 +- completions/_mock | 2 +- completions/_modules | 2 +- completions/_mount | 2 +- completions/_mount.linux | 2 +- completions/_newgrp | 2 +- completions/_nmcli | 2 +- completions/_op | 2 +- completions/_renice | 2 +- completions/_repomanage | 2 +- completions/_reptyr | 2 +- completions/_rfkill | 2 +- completions/_rtcwake | 2 +- completions/_slackpkg | 2 +- completions/_su | 2 +- completions/_svn | 2 +- completions/_svnadmin | 2 +- completions/_svnlook | 2 +- completions/_udevadm | 2 +- completions/_umount | 2 +- completions/_umount.linux | 2 +- completions/_xm | 2 +- completions/_yum | 2 +- completions/a2x | 2 +- completions/abook | 2 +- completions/aclocal | 2 +- completions/acpi | 2 +- completions/add_members | 2 +- completions/alias | 2 +- completions/ant | 2 +- completions/apache2ctl | 2 +- completions/appdata-validate | 2 +- completions/apt-build | 2 +- completions/apt-cache | 2 +- completions/apt-get | 2 +- completions/apt-mark | 2 +- completions/aptitude | 2 +- completions/arch | 2 +- completions/arp | 2 +- completions/arping | 2 +- completions/arpspoof | 2 +- completions/asciidoc | 2 +- completions/aspell | 2 +- completions/autoconf | 2 +- completions/automake | 2 +- completions/autoreconf | 2 +- completions/autorpm | 2 +- completions/autoscan | 2 +- completions/avahi-browse | 2 +- completions/avctrl | 2 +- completions/badblocks | 2 +- completions/bind | 2 +- completions/bk | 2 +- completions/brctl | 2 +- completions/btdownloadheadless.py | 2 +- completions/bts | 2 +- completions/bzip2 | 2 +- completions/cancel | 2 +- completions/cardctl | 2 +- completions/carton | 2 +- completions/ccache | 2 +- completions/ccze | 2 +- completions/cfagent | 2 +- completions/cfrun | 2 +- completions/chage | 2 +- completions/change_pw | 2 +- completions/check_db | 2 +- completions/check_perms | 2 +- completions/checksec | 2 +- completions/chgrp | 2 +- completions/chkconfig | 2 +- completions/chmod | 2 +- completions/chown | 2 +- completions/chpasswd | 2 +- completions/chromium-browser | 2 +- completions/chronyc | 2 +- completions/chrpath | 2 +- completions/cksfv | 2 +- completions/cleanarch | 2 +- completions/clisp | 2 +- completions/clone_member | 2 +- completions/complete | 2 +- completions/config_list | 2 +- completions/configure | 2 +- completions/convert | 22 ++++---- completions/cowsay | 2 +- completions/cpan2dist | 2 +- completions/cpio | 2 +- completions/cppcheck | 2 +- completions/crontab | 2 +- completions/cryptsetup | 2 +- completions/curl | 2 +- completions/cvs | 2 +- completions/cvsps | 2 +- completions/dd | 2 +- completions/declare | 2 +- completions/deja-dup | 2 +- completions/desktop-file-validate | 2 +- completions/dhclient | 2 +- completions/dict | 2 +- completions/dmypy | 2 +- completions/dnssec-keygen | 2 +- completions/dnsspoof | 2 +- completions/dot | 2 +- completions/dpkg | 4 +- completions/dpkg-source | 2 +- completions/dselect | 2 +- completions/dsniff | 2 +- completions/dumpdb | 2 +- completions/dumpe2fs | 2 +- completions/e2freefrag | 2 +- completions/e2label | 2 +- completions/ebtables | 2 +- completions/ecryptfs-migrate-home | 2 +- completions/eog | 2 +- completions/ether-wake | 2 +- completions/evince | 2 +- completions/export | 2 +- completions/faillog | 2 +- completions/fbgs | 2 +- completions/fbi | 2 +- completions/feh | 2 +- completions/file | 2 +- completions/file-roller | 2 +- completions/filefrag | 2 +- completions/filesnarf | 2 +- completions/find | 2 +- completions/find_member | 2 +- completions/fio | 2 +- completions/firefox | 2 +- completions/flake8 | 2 +- completions/freebsd-update | 2 +- completions/freeciv | 2 +- completions/freeciv-server | 2 +- completions/function | 2 +- completions/fusermount | 2 +- completions/gcc | 2 +- completions/gcl | 2 +- completions/gdb | 2 +- completions/genaliases | 2 +- completions/gendiff | 2 +- completions/genisoimage | 2 +- completions/geoiplookup | 2 +- completions/getconf | 2 +- completions/getent | 2 +- completions/gkrellm | 2 +- completions/gm | 2 +- completions/gnatmake | 2 +- completions/gnokii | 2 +- completions/gnome-mplayer | 2 +- completions/gnome-screenshot | 2 +- completions/gpasswd | 2 +- completions/gpg | 2 +- completions/gpg2 | 2 +- completions/gpgv | 2 +- completions/gphoto2 | 2 +- completions/gprof | 2 +- completions/groupadd | 2 +- completions/groupdel | 2 +- completions/groupmems | 2 +- completions/groupmod | 2 +- completions/growisofs | 2 +- completions/grpck | 2 +- completions/gssdp-discover | 2 +- completions/gzip | 2 +- completions/hcitool | 16 +++--- completions/hddtemp | 2 +- completions/hid2hci | 2 +- completions/hostname | 2 +- completions/hping2 | 2 +- completions/htop | 2 +- completions/htpasswd | 2 +- completions/hunspell | 2 +- completions/iconv | 2 +- completions/id | 2 +- completions/idn | 2 +- completions/ifstat | 2 +- completions/iftop | 2 +- completions/ifup | 2 +- completions/influx | 2 +- completions/info | 2 +- completions/inject | 2 +- completions/inotifywait | 2 +- completions/insmod | 2 +- completions/installpkg | 2 +- completions/interdiff | 2 +- completions/invoke-rc.d | 2 +- completions/ip | 2 +- completions/ipcalc | 2 +- completions/iperf | 2 +- completions/ipmitool | 2 +- completions/ipsec | 4 +- completions/iptables | 2 +- completions/ipv6calc | 2 +- completions/iscsiadm | 2 +- completions/isort | 2 +- completions/isql | 2 +- completions/iwconfig | 2 +- completions/iwlist | 2 +- completions/iwpriv | 2 +- completions/iwspy | 2 +- completions/jar | 2 +- completions/jarsigner | 2 +- completions/java | 6 +- completions/javaws | 2 +- completions/jpegoptim | 2 +- completions/jps | 2 +- completions/jq | 2 +- completions/jshint | 2 +- completions/json_xs | 2 +- completions/jsonschema | 2 +- completions/k3b | 2 +- completions/kcov | 2 +- completions/kill | 2 +- completions/killall | 2 +- completions/kldload | 2 +- completions/kldunload | 2 +- completions/koji | 2 +- completions/ktutil | 2 +- completions/larch | 2 +- completions/lastlog | 2 +- completions/ldapsearch | 14 ++--- completions/ldapvi | 2 +- completions/lftp | 2 +- completions/lftpget | 2 +- completions/lilo | 2 +- completions/links | 2 +- completions/lintian | 4 +- completions/lisp | 2 +- completions/list_admins | 2 +- completions/list_lists | 2 +- completions/list_members | 2 +- completions/list_owners | 2 +- completions/locale-gen | 2 +- completions/lpq | 2 +- completions/lpr | 2 +- completions/lrzip | 2 +- completions/lsof | 2 +- completions/lspci | 2 +- completions/lsscsi | 2 +- completions/lsusb | 2 +- completions/lua | 2 +- completions/luac | 2 +- completions/luseradd | 2 +- completions/luserdel | 2 +- completions/lvm | 72 ++++++++++++------------ completions/lz4 | 2 +- completions/lzip | 2 +- completions/lzma | 2 +- completions/lzop | 2 +- completions/macof | 2 +- completions/mailmanctl | 2 +- completions/make | 2 +- completions/makepkg | 2 +- completions/man | 2 +- completions/mc | 2 +- completions/mcrypt | 2 +- completions/mdadm | 2 +- completions/mdtool | 2 +- completions/medusa | 2 +- completions/mii-diag | 2 +- completions/mii-tool | 2 +- completions/minicom | 2 +- completions/mkinitrd | 2 +- completions/mktemp | 2 +- completions/mmsitepass | 2 +- completions/modinfo | 2 +- completions/modprobe | 2 +- completions/monodevelop | 2 +- completions/mplayer | 2 +- completions/mr | 2 +- completions/msynctool | 2 +- completions/mtx | 2 +- completions/munin-node-configure | 2 +- completions/munin-run | 2 +- completions/munin-update | 2 +- completions/munindoc | 2 +- completions/mussh | 2 +- completions/mutt | 2 +- completions/mypy | 2 +- completions/mysql | 2 +- completions/mysqladmin | 2 +- completions/nc | 2 +- completions/ncftp | 2 +- completions/nethogs | 2 +- completions/newlist | 2 +- completions/newusers | 2 +- completions/ngrep | 2 +- completions/nmap | 2 +- completions/nproc | 2 +- completions/nslookup | 4 +- completions/nsupdate | 2 +- completions/ntpdate | 2 +- completions/oggdec | 2 +- completions/openssl | 2 +- completions/opera | 2 +- completions/optipng | 2 +- completions/p4 | 2 +- completions/pack200 | 2 +- completions/passwd | 2 +- completions/patch | 2 +- completions/pdftoppm | 2 +- completions/pdftotext | 2 +- completions/perl | 4 +- completions/perlcritic | 2 +- completions/perltidy | 2 +- completions/pgrep | 2 +- completions/pidof | 2 +- completions/pine | 2 +- completions/ping | 2 +- completions/pkg-config | 2 +- completions/pkg_delete | 2 +- completions/pkgadd | 2 +- completions/pkgrm | 2 +- completions/pkgtool | 2 +- completions/pkgutil | 2 +- completions/plague-client | 2 +- completions/pm-hibernate | 2 +- completions/pm-is-supported | 2 +- completions/pm-powersave | 2 +- completions/pngfix | 2 +- completions/portinstall | 2 +- completions/portsnap | 2 +- completions/portupgrade | 2 +- completions/postcat | 2 +- completions/postconf | 2 +- completions/postfix | 2 +- completions/postmap | 2 +- completions/postsuper | 2 +- completions/povray | 2 +- completions/prelink | 2 +- completions/printenv | 2 +- completions/protoc | 2 +- completions/ps | 2 +- completions/psql | 10 ++-- completions/puppet | 2 +- completions/pv | 2 +- completions/pwck | 2 +- completions/pwd | 2 +- completions/pwdx | 2 +- completions/pwgen | 2 +- completions/pycodestyle | 2 +- completions/pydoc | 2 +- completions/pydocstyle | 2 +- completions/pyflakes | 2 +- completions/pylint | 2 +- completions/pytest | 2 +- completions/python | 2 +- completions/pyvenv | 2 +- completions/qdbus | 2 +- completions/qemu | 2 +- completions/qrunner | 2 +- completions/querybts | 2 +- completions/quota | 10 ++-- completions/radvdump | 2 +- completions/rcs | 2 +- completions/rdesktop | 2 +- completions/remove_members | 2 +- completions/removepkg | 2 +- completions/reportbug | 2 +- completions/resolvconf | 2 +- completions/ri | 2 +- completions/rmlist | 2 +- completions/rmmod | 2 +- completions/route | 2 +- completions/rpcdebug | 2 +- completions/rpm | 4 +- completions/rpm2tgz | 2 +- completions/rpmcheck | 2 +- completions/rrdtool | 2 +- completions/rsync | 2 +- completions/sbcl | 2 +- completions/sbopkg | 2 +- completions/screen | 2 +- completions/scrub | 2 +- completions/secret-tool | 2 +- completions/sh | 2 +- completions/sha256sum | 2 +- completions/shellcheck | 2 +- completions/sitecopy | 2 +- completions/slapt-get | 2 +- completions/slapt-src | 2 +- completions/smartctl | 2 +- completions/smbclient | 14 ++--- completions/snownews | 2 +- completions/sqlite3 | 2 +- completions/ss | 2 +- completions/ssh | 6 +- completions/ssh-add | 2 +- completions/ssh-copy-id | 2 +- completions/ssh-keygen | 2 +- completions/ssh-keyscan | 2 +- completions/sshfs | 2 +- completions/sshmitm | 2 +- completions/sshow | 2 +- completions/strace | 2 +- completions/strings | 2 +- completions/sudo | 2 +- completions/svcadm | 2 +- completions/svk | 2 +- completions/sync_members | 2 +- completions/synclient | 2 +- completions/sysbench | 2 +- completions/sysctl | 2 +- completions/tar | 4 +- completions/tcpdump | 2 +- completions/tcpkill | 2 +- completions/tcpnice | 2 +- completions/timeout | 2 +- completions/tipc | 2 +- completions/tox | 2 +- completions/tracepath | 2 +- completions/tree | 2 +- completions/truncate | 2 +- completions/tshark | 2 +- completions/tsig-keygen | 2 +- completions/tune2fs | 2 +- completions/ulimit | 2 +- completions/unace | 2 +- completions/unpack200 | 2 +- completions/unrar | 2 +- completions/unshunt | 2 +- completions/update-alternatives | 2 +- completions/update-rc.d | 2 +- completions/upgradepkg | 2 +- completions/urlsnarf | 2 +- completions/uscan | 2 +- completions/useradd | 2 +- completions/userdel | 2 +- completions/usermod | 2 +- completions/valgrind | 2 +- completions/vipw | 2 +- completions/vmstat | 2 +- completions/vncviewer | 4 +- completions/vpnc | 2 +- completions/watch | 2 +- completions/webmitm | 2 +- completions/wget | 2 +- completions/wine | 2 +- completions/withlist | 2 +- completions/wodim | 2 +- completions/wol | 2 +- completions/wsimport | 2 +- completions/wtf | 2 +- completions/wvdial | 2 +- completions/xdg-mime | 2 +- completions/xdg-settings | 2 +- completions/xev | 2 +- completions/xfreerdp | 2 +- completions/xgamma | 2 +- completions/xhost | 2 +- completions/xmllint | 2 +- completions/xmlwf | 2 +- completions/xmms | 2 +- completions/xmodmap | 2 +- completions/xrandr | 2 +- completions/xrdb | 2 +- completions/xsltproc | 2 +- completions/xvfb-run | 2 +- completions/xxd | 2 +- completions/xz | 2 +- completions/xzdec | 2 +- completions/ypmatch | 2 +- completions/yum-arch | 2 +- completions/zopfli | 2 +- completions/zopflipng | 2 +- test/t/unit/test_unit_init_completion.py | 6 +- 478 files changed, 572 insertions(+), 572 deletions(-) diff --git a/bash_completion b/bash_completion index 93a9604fb62..bbf9f09fd30 100644 --- a/bash_completion +++ b/bash_completion @@ -971,7 +971,7 @@ _comp_delimited() # The word to be completed is expected to contain the entire assignment, # including the variable name and the "=". Some known variables are completed # with colon separated values; for those to work, colon should not have been -# used to split words. See related parameters to _init_completion. +# used to split words. See related parameters to _comp_initialize. # # @param $1 variable assignment to be completed # @return True (0) if variable value completion was attempted, @@ -1037,7 +1037,7 @@ _comp_variable_assignments() # @return True (0) if completion needs further processing, # False (> 0) no further processing is necessary. # -_init_completion() +_comp_initialize() { local exclude="" flag outx errx inx OPTIND=1 @@ -1606,7 +1606,7 @@ _services() _service() { local cur prev words cword - _init_completion || return + _comp_initialize || return # don't complete past 2nd token ((cword > 2)) && return @@ -1896,7 +1896,7 @@ _bashcomp_try_faketty() _user_at_host() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return if [[ $cur == *@* ]]; then _known_hosts_real "$cur" @@ -1912,7 +1912,7 @@ shopt -u hostcomplete && complete -F _user_at_host talk ytalk finger _known_hosts() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return # NOTE: Using `_known_hosts' as a helper function and passing options # to `_known_hosts' is deprecated: Use `_known_hosts_real' instead. @@ -2194,7 +2194,7 @@ complete -F _known_hosts traceroute traceroute6 \ _cd() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_help help "$1")' -- "$cur")) @@ -2396,7 +2396,7 @@ _complete_as_root() _longopt() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case "${prev,,}" in --help | --usage | --version) @@ -2455,7 +2455,7 @@ declare -Ag _xspecs _filedir_xspec() { local cur prev words cword - _init_completion || return + _comp_initialize || return _tilde "$cur" || return @@ -2577,7 +2577,7 @@ unset -f _install_xspec _minimal() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return $split && return _filedir } diff --git a/completions/2to3 b/completions/2to3 index 7c5b3303a2a..7624a2835ee 100644 --- a/completions/2to3 +++ b/completions/2to3 @@ -3,7 +3,7 @@ _2to3() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -h | --help | --add-suffix) diff --git a/completions/7z b/completions/7z index b6007ecdff6..505efe69b72 100644 --- a/completions/7z +++ b/completions/7z @@ -3,7 +3,7 @@ _7z() { local cur prev words cword - _init_completion -n = || return + _comp_initialize -n = || return if ((cword == 1)); then COMPREPLY=($(compgen -W 'a b d e h i l rn t u x' -- "$cur")) diff --git a/completions/_adb b/completions/_adb index e1e19924465..0bd1512a14a 100644 --- a/completions/_adb +++ b/completions/_adb @@ -13,7 +13,7 @@ _adb_command_usage() _adb() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -s | -p | --algo | --key | --iv) diff --git a/completions/_cal b/completions/_cal index cf80b2b7803..72f782d1a6b 100644 --- a/completions/_cal +++ b/completions/_cal @@ -6,7 +6,7 @@ _cal() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -m) diff --git a/completions/_chsh b/completions/_chsh index a6c8db3e8cb..4281d89e69d 100644 --- a/completions/_chsh +++ b/completions/_chsh @@ -6,7 +6,7 @@ _chsh() { local cur prev words cword - _init_completion || return + _comp_initialize || return local word chroot for word in "${words[@]}"; do diff --git a/completions/_dmesg b/completions/_dmesg index 2d5530c4b1f..a792e5756df 100644 --- a/completions/_dmesg +++ b/completions/_dmesg @@ -8,7 +8,7 @@ _dmesg() [[ $OSTYPE == *solaris* ]] && return # no args there local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h | --help | -V | --version | -s | --buffer-size | -M | -N) diff --git a/completions/_eject b/completions/_eject index 52168f741b3..20ee95e1ca7 100644 --- a/completions/_eject +++ b/completions/_eject @@ -6,7 +6,7 @@ _eject() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h | --help | -V | --version | -c | --changerslot | -x | --cdspeed) diff --git a/completions/_hexdump b/completions/_hexdump index a8226e15f70..a8a534c0ac5 100644 --- a/completions/_hexdump +++ b/completions/_hexdump @@ -6,7 +6,7 @@ _hexdump() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -V | -e | -n | -s) diff --git a/completions/_hwclock b/completions/_hwclock index ef437a26e7a..5a8c8054331 100644 --- a/completions/_hwclock +++ b/completions/_hwclock @@ -6,7 +6,7 @@ _hwclock() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h | --help | -V | --version | --date | --epoch) diff --git a/completions/_ionice b/completions/_ionice index 99174df4e32..b2ca0497777 100644 --- a/completions/_ionice +++ b/completions/_ionice @@ -6,7 +6,7 @@ _ionice() { local cur prev words cword - _init_completion || return + _comp_initialize || return local offset=0 i for ((i = 1; i <= cword; i++)); do diff --git a/completions/_look b/completions/_look index 9788dec5a06..73486ceef69 100644 --- a/completions/_look +++ b/completions/_look @@ -6,7 +6,7 @@ _look() { local cur prev words cword - _init_completion || return + _comp_initialize || return if ((cword == 1)); then COMPREPLY=($(compgen -W '$(look "$cur" 2>/dev/null)' -- "$cur")) diff --git a/completions/_mock b/completions/_mock index b468148d16b..c34a7098992 100644 --- a/completions/_mock +++ b/completions/_mock @@ -6,7 +6,7 @@ _mock() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local plugins='tmpfs root_cache yum_cache bind_mount ccache' local cfgdir=/etc/mock count=0 i diff --git a/completions/_modules b/completions/_modules index 0f79c23398d..e6778157ca4 100644 --- a/completions/_modules +++ b/completions/_modules @@ -48,7 +48,7 @@ _module_avail() _module() { local cur prev words cword - _init_completion || return + _comp_initialize || return if ((cword == 1)); then # First parameter on line -- we expect it to be a mode selection diff --git a/completions/_mount b/completions/_mount index 3ab57e29a86..3fcbaa4adb2 100644 --- a/completions/_mount +++ b/completions/_mount @@ -17,7 +17,7 @@ fi _mount() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return local sm host diff --git a/completions/_mount.linux b/completions/_mount.linux index e529b62e803..7e079be82aa 100644 --- a/completions/_mount.linux +++ b/completions/_mount.linux @@ -6,7 +6,7 @@ _mount() { local cur prev words cword - _init_completion -n =: || return + _comp_initialize -n =: || return local split=false case "$prev" in diff --git a/completions/_newgrp b/completions/_newgrp index a2dc3edaed6..b1cc393c39f 100644 --- a/completions/_newgrp +++ b/completions/_newgrp @@ -6,7 +6,7 @@ _newgrp() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == "-" ]]; then COMPREPLY=(-) diff --git a/completions/_nmcli b/completions/_nmcli index eac285b08b2..79665c3f362 100644 --- a/completions/_nmcli +++ b/completions/_nmcli @@ -37,7 +37,7 @@ _nmcli_ab_bssid() _nmcli() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -m | --mode) diff --git a/completions/_op b/completions/_op index 0565cfd0402..63d885d0557 100644 --- a/completions/_op +++ b/completions/_op @@ -28,7 +28,7 @@ _op_command_options() _op() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local command i for ((i = 1; i < cword; i++)); do diff --git a/completions/_renice b/completions/_renice index a4167440e12..e9cd22350d6 100644 --- a/completions/_renice +++ b/completions/_renice @@ -6,7 +6,7 @@ _renice() { local cur prev words cword - _init_completion || return + _comp_initialize || return local command=$1 curopt i=0 diff --git a/completions/_repomanage b/completions/_repomanage index ba0787e7006..d36e0bd8b62 100644 --- a/completions/_repomanage +++ b/completions/_repomanage @@ -6,7 +6,7 @@ _repomanage() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return [[ $prev == -@([hk]|-help|-keep) ]] && return diff --git a/completions/_reptyr b/completions/_reptyr index 01d61b2ae72..fae617b3c1a 100644 --- a/completions/_reptyr +++ b/completions/_reptyr @@ -6,7 +6,7 @@ _reptyr() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -l) diff --git a/completions/_rfkill b/completions/_rfkill index 96a6c09838f..e1c9719069a 100644 --- a/completions/_rfkill +++ b/completions/_rfkill @@ -6,7 +6,7 @@ _rfkill() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--version' -- "$cur")) diff --git a/completions/_rtcwake b/completions/_rtcwake index c7b69c46521..ce9bb9684a8 100644 --- a/completions/_rtcwake +++ b/completions/_rtcwake @@ -6,7 +6,7 @@ _rtcwake() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case "$prev" in --help | -h | --version | -V | --seconds | -s | --time | -t) diff --git a/completions/_slackpkg b/completions/_slackpkg index 10ddf3ba5ab..65bbbc6a8df 100644 --- a/completions/_slackpkg +++ b/completions/_slackpkg @@ -7,7 +7,7 @@ _slackpkg() { local cur prev words cword - _init_completion -n = || return + _comp_initialize -n = || return local split=false if [[ $cur == -?*=* ]]; then diff --git a/completions/_su b/completions/_su index 34925817f4e..a0afec87ef9 100644 --- a/completions/_su +++ b/completions/_su @@ -11,7 +11,7 @@ fi _su() { # linux-specific completion local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case "$prev" in -s | --shell) diff --git a/completions/_svn b/completions/_svn index e04131d937f..4bc2fba1e71 100644 --- a/completions/_svn +++ b/completions/_svn @@ -6,7 +6,7 @@ _svn() { local cur prev words cword - _init_completion || return + _comp_initialize || return local commands commands='add blame praise annotate ann cat checkout co cleanup commit \ diff --git a/completions/_svnadmin b/completions/_svnadmin index 654fd3ecd78..52de46c0c08 100644 --- a/completions/_svnadmin +++ b/completions/_svnadmin @@ -6,7 +6,7 @@ _svnadmin() { local cur prev words cword - _init_completion || return + _comp_initialize || return local commands commands='create deltify dump help ? hotcopy list-dblogs list-unused-dblogs diff --git a/completions/_svnlook b/completions/_svnlook index 36188a576a9..aa190eab132 100644 --- a/completions/_svnlook +++ b/completions/_svnlook @@ -6,7 +6,7 @@ _svnlook() { local cur prev words cword - _init_completion || return + _comp_initialize || return local commands commands='author cat changed date diff dirs-changed help ? h history info diff --git a/completions/_udevadm b/completions/_udevadm index 1afa8f881f3..91b90165585 100644 --- a/completions/_udevadm +++ b/completions/_udevadm @@ -6,7 +6,7 @@ _udevadm() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local i udevcmd for ((i = 1; i < cword; i++)); do diff --git a/completions/_umount b/completions/_umount index 36d5703f6d2..1ab09fd79c7 100644 --- a/completions/_umount +++ b/completions/_umount @@ -14,7 +14,7 @@ fi _umount() { local cur prev words cword - _init_completion || return + _comp_initialize || return local IFS=$'\n' COMPREPLY=($(compgen -W '$(mount | cut -d" " -f 3)' -- "$cur")) diff --git a/completions/_umount.linux b/completions/_umount.linux index a9bc0ca6894..113434b69ff 100644 --- a/completions/_umount.linux +++ b/completions/_umount.linux @@ -96,7 +96,7 @@ _linux_fstab() _umount() { local cur prev words cword - _init_completion || return + _comp_initialize || return case "$prev" in -t) diff --git a/completions/_xm b/completions/_xm index ffa1a4d619c..3186b318ea1 100644 --- a/completions/_xm +++ b/completions/_xm @@ -19,7 +19,7 @@ _xen_domain_ids() _xm() { local cur prev words cword - _init_completion || return + _comp_initialize || return # TODO: _split_longopt diff --git a/completions/_yum b/completions/_yum index 1802627d8fe..ffea2e5530c 100644 --- a/completions/_yum +++ b/completions/_yum @@ -40,7 +40,7 @@ _yum_plugins() _yum() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local special i for ((i = 1; i < ${#words[@]} - 1; i++)); do diff --git a/completions/a2x b/completions/a2x index e5f6d9b8f11..124334046e9 100644 --- a/completions/a2x +++ b/completions/a2x @@ -3,7 +3,7 @@ _a2x() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --attribute | --asciidoc-opts | --dblatex-opts | --fop-opts | --help | \ diff --git a/completions/abook b/completions/abook index 349a8167eb7..b4a3f4401f4 100644 --- a/completions/abook +++ b/completions/abook @@ -3,7 +3,7 @@ _abook() { local cur prev words cword - _init_completion || return + _comp_initialize || return # abook only takes options, tabbing after command name adds a single dash [[ $cword -eq 1 && ! $cur ]] && diff --git a/completions/aclocal b/completions/aclocal index 010862fb881..04d9d1be55b 100644 --- a/completions/aclocal +++ b/completions/aclocal @@ -3,7 +3,7 @@ _aclocal() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case "$prev" in --help | --print-ac-dir | --version) diff --git a/completions/acpi b/completions/acpi index f2c38b210d1..5475d2a067b 100644 --- a/completions/acpi +++ b/completions/acpi @@ -3,7 +3,7 @@ _acpi() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version | -!(-*)[hv]) diff --git a/completions/add_members b/completions/add_members index 431bce70a66..00c90e31ed8 100644 --- a/completions/add_members +++ b/completions/add_members @@ -3,7 +3,7 @@ _add_members() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -r | -d | --regular-members-file | --digest-members-file) diff --git a/completions/alias b/completions/alias index 92211d839ef..c9d55c4b934 100644 --- a/completions/alias +++ b/completions/alias @@ -3,7 +3,7 @@ _alias() { local cur prev words cword - _init_completion -n = || return + _comp_initialize -n = || return case ${words[@]} in *[^=]) diff --git a/completions/ant b/completions/ant index 2c7a9b0bae3..2241342fd44 100644 --- a/completions/ant +++ b/completions/ant @@ -28,7 +28,7 @@ _ant_parse_targets() _ant() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h | -help | --h | --help | -projecthelp | -p | -version | -diagnostics) diff --git a/completions/apache2ctl b/completions/apache2ctl index 980b3c58c84..2f388fbdd38 100644 --- a/completions/apache2ctl +++ b/completions/apache2ctl @@ -3,7 +3,7 @@ _apache2ctl() { local cur prev words cword - _init_completion || return + _comp_initialize || return local APWORDS APWORDS=$($1 2>&1 >/dev/null | awk 'NR<2 { print $3; exit }' | diff --git a/completions/appdata-validate b/completions/appdata-validate index 03d8cc9a064..12e16053377 100644 --- a/completions/appdata-validate +++ b/completions/appdata-validate @@ -3,7 +3,7 @@ _appdata_validate() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -h | --help | --version) diff --git a/completions/apt-build b/completions/apt-build index 3b6f45399a2..b257d926b6a 100644 --- a/completions/apt-build +++ b/completions/apt-build @@ -3,7 +3,7 @@ _apt_build() { local cur prev words cword - _init_completion || return + _comp_initialize || return local special i for ((i = 1; i < ${#words[@]} - 1; i++)); do diff --git a/completions/apt-cache b/completions/apt-cache index fd811682d5f..ed0b15cefb5 100644 --- a/completions/apt-cache +++ b/completions/apt-cache @@ -26,7 +26,7 @@ _comp_deprecate_func _apt_cache_src_packages _comp_xfunc_apt_cache_src_packages _apt_cache() { local cur prev words cword - _init_completion || return + _comp_initialize || return local special ispecial if [[ $cur != show ]]; then diff --git a/completions/apt-get b/completions/apt-get index 7ceefb57d67..d1a5e95faec 100644 --- a/completions/apt-get +++ b/completions/apt-get @@ -18,7 +18,7 @@ _comp_deprecate_func _comp_cmd_apt_get_installed_packages _comp_xfunc_apt_get_in _apt_get() { local cur prev words cword package - _init_completion -n ':=' || return + _comp_initialize -n ':=' || return local special i for ((i = 1; i < ${#words[@]} - 1; i++)); do diff --git a/completions/apt-mark b/completions/apt-mark index 05a996dd56c..28e432b114d 100644 --- a/completions/apt-mark +++ b/completions/apt-mark @@ -3,7 +3,7 @@ _comp_cmd_apt_mark() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local special i for ((i = 1; i < ${#words[@]} - 1; i++)); do diff --git a/completions/aptitude b/completions/aptitude index 324e9bfb4d4..ae13fe62838 100644 --- a/completions/aptitude +++ b/completions/aptitude @@ -16,7 +16,7 @@ fi _aptitude() { local cur prev words cword - _init_completion || return + _comp_initialize || return local special i for ((i = 1; i < ${#words[@]} - 1; i++)); do diff --git a/completions/arch b/completions/arch index bcc2b0f4240..7c2d4b80836 100644 --- a/completions/arch +++ b/completions/arch @@ -6,7 +6,7 @@ _comp_have_command mailmanctl && _arch() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -w | -g | -d | --welcome-msg | --goodbye-msg | --digest) diff --git a/completions/arp b/completions/arp index c1e8284652b..85696189c25 100644 --- a/completions/arp +++ b/completions/arp @@ -3,7 +3,7 @@ _arp() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --device | -!(-*)i) diff --git a/completions/arping b/completions/arping index 57e1e19b471..2556257b36f 100644 --- a/completions/arping +++ b/completions/arping @@ -3,7 +3,7 @@ _arping() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*c | -*w) diff --git a/completions/arpspoof b/completions/arpspoof index d1a1373593b..690265da93f 100644 --- a/completions/arpspoof +++ b/completions/arpspoof @@ -3,7 +3,7 @@ _arpspoof() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -i) diff --git a/completions/asciidoc b/completions/asciidoc index a078a862504..83dd75750ac 100644 --- a/completions/asciidoc +++ b/completions/asciidoc @@ -10,7 +10,7 @@ _comp_deprecate_func _asciidoc_doctype _comp_xfunc_asciidoc_doctype _asciidoc() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --attribute | -!(-*)a) diff --git a/completions/aspell b/completions/aspell index 6696ca3da22..5a3d456a247 100644 --- a/completions/aspell +++ b/completions/aspell @@ -19,7 +19,7 @@ _aspell_dictionary() _aspell() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -c | -p | check | --conf | --personal | --repl | --per-conf) diff --git a/completions/autoconf b/completions/autoconf index b51e797e001..69d92703b1f 100644 --- a/completions/autoconf +++ b/completions/autoconf @@ -3,7 +3,7 @@ _autoconf() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case "$prev" in --help | -h | --version | -V | --trace | -t) diff --git a/completions/automake b/completions/automake index 5fe5f4f86d7..7100cd39c2d 100644 --- a/completions/automake +++ b/completions/automake @@ -3,7 +3,7 @@ _automake() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case "$prev" in --help | --version) diff --git a/completions/autoreconf b/completions/autoreconf index 9b0f0dc9410..a2aae8f0791 100644 --- a/completions/autoreconf +++ b/completions/autoreconf @@ -3,7 +3,7 @@ _autoreconf() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case "$prev" in --help | -h | --version | -V) diff --git a/completions/autorpm b/completions/autorpm index d55322ab819..1b6b0f64adc 100644 --- a/completions/autorpm +++ b/completions/autorpm @@ -3,7 +3,7 @@ _autorpm() { local cur prev words cword - _init_completion || return + _comp_initialize || return COMPREPLY=($(compgen -W '--notty --debug --help --version auto add fullinfo info help install list remove set' -- "$cur")) diff --git a/completions/autoscan b/completions/autoscan index e0071437197..9ff1aed6c8d 100644 --- a/completions/autoscan +++ b/completions/autoscan @@ -3,7 +3,7 @@ _autoscan() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case "$prev" in --help | --version | -!(-*)[hV]) diff --git a/completions/avahi-browse b/completions/avahi-browse index 18c9448fe7c..32afa13f681 100644 --- a/completions/avahi-browse +++ b/completions/avahi-browse @@ -3,7 +3,7 @@ _comp_cmd_avahi_browse() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --domain | -!(-*)D) diff --git a/completions/avctrl b/completions/avctrl index 89c24e470d0..c19ad7a41b0 100644 --- a/completions/avctrl +++ b/completions/avctrl @@ -3,7 +3,7 @@ _avctrl() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--help --quiet' -- "$cur")) diff --git a/completions/badblocks b/completions/badblocks index 29c4e00d6c1..bc533306f12 100644 --- a/completions/badblocks +++ b/completions/badblocks @@ -3,7 +3,7 @@ _badblocks() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*[bcedpt]) diff --git a/completions/bind b/completions/bind index 82e85b8bc46..cee916b6a91 100644 --- a/completions/bind +++ b/completions/bind @@ -3,7 +3,7 @@ _bind() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*[lpPsSvVrxX]) diff --git a/completions/bk b/completions/bk index 4e4d140aeb1..b22b5bc6102 100644 --- a/completions/bk +++ b/completions/bk @@ -4,7 +4,7 @@ _bk() { local cur prev words cword - _init_completion || return + _comp_initialize || return local BKCMDS="$(bk help topics 2>/dev/null | awk '/^ bk/ { print $2 }' | xargs printf '%s ')" diff --git a/completions/brctl b/completions/brctl index 14569b64878..620f77d569d 100644 --- a/completions/brctl +++ b/completions/brctl @@ -3,7 +3,7 @@ _brctl() { local cur prev words cword - _init_completion || return + _comp_initialize || return local command=${words[1]} diff --git a/completions/btdownloadheadless.py b/completions/btdownloadheadless.py index a470e535780..18cb8f81d50 100644 --- a/completions/btdownloadheadless.py +++ b/completions/btdownloadheadless.py @@ -3,7 +3,7 @@ _btdownload() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --responsefile | --saveas) diff --git a/completions/bts b/completions/bts index c1d117e76b5..24616e82e7e 100644 --- a/completions/bts +++ b/completions/bts @@ -19,7 +19,7 @@ _src_packages_with_prefix() _bts() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in show | bugs) diff --git a/completions/bzip2 b/completions/bzip2 index 40e50fe321e..22e85b9b4c2 100644 --- a/completions/bzip2 +++ b/completions/bzip2 @@ -3,7 +3,7 @@ _bzip2() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | -!(-*)[bhp]) diff --git a/completions/cancel b/completions/cancel index 3e0c1d52735..ef1907c5146 100644 --- a/completions/cancel +++ b/completions/cancel @@ -3,7 +3,7 @@ _cancel() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h) diff --git a/completions/cardctl b/completions/cardctl index bb3a0dba522..107867eaa14 100644 --- a/completions/cardctl +++ b/completions/cardctl @@ -3,7 +3,7 @@ _cardctl() { local cur prev words cword - _init_completion || return + _comp_initialize || return if ((cword == 1)); then COMPREPLY=($(compgen -W 'status config ident suspend resume reset diff --git a/completions/carton b/completions/carton index d92467e02c9..cabf38827bc 100644 --- a/completions/carton +++ b/completions/carton @@ -16,7 +16,7 @@ _carton_command_help() _carton() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local i command for ((i = 1; i < cword; i++)); do diff --git a/completions/ccache b/completions/ccache index 97fb592b2fa..1991a5a1499 100644 --- a/completions/ccache +++ b/completions/ccache @@ -3,7 +3,7 @@ _ccache() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local i for ((i = 1; i <= COMP_CWORD; i++)); do diff --git a/completions/ccze b/completions/ccze index 35f4c3f3314..0309231f322 100644 --- a/completions/ccze +++ b/completions/ccze @@ -3,7 +3,7 @@ _ccze() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -'?' | --help | --usage | -V | --version) diff --git a/completions/cfagent b/completions/cfagent index e7ba04de0b2..bd2e365b620 100644 --- a/completions/cfagent +++ b/completions/cfagent @@ -3,7 +3,7 @@ _cfagent() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -f | --file) diff --git a/completions/cfrun b/completions/cfrun index 72b613890a3..5b5bc994c59 100644 --- a/completions/cfrun +++ b/completions/cfrun @@ -3,7 +3,7 @@ _cfrun() { local cur prev words cword - _init_completion || return + _comp_initialize || return local i section=1 for ((i = 1; i < cword; i++)); do diff --git a/completions/chage b/completions/chage index fcf87cd49cd..488ae15c20a 100644 --- a/completions/chage +++ b/completions/chage @@ -3,7 +3,7 @@ _chage() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --lastday | --expiredate | --help | --inactive | --mindays | --maxdays | \ diff --git a/completions/change_pw b/completions/change_pw index 3f99b333c98..f32ec7312d5 100644 --- a/completions/change_pw +++ b/completions/change_pw @@ -3,7 +3,7 @@ _change_pw() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -l | --listname) diff --git a/completions/check_db b/completions/check_db index 8eb7e5f80a8..0064c87e29f 100644 --- a/completions/check_db +++ b/completions/check_db @@ -3,7 +3,7 @@ _check_db() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--all --verbose --help' -- "$cur")) diff --git a/completions/check_perms b/completions/check_perms index 8ff276ef317..be69fc190e4 100644 --- a/completions/check_perms +++ b/completions/check_perms @@ -3,7 +3,7 @@ _check_perms() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '-f -v -h' -- "$cur")) diff --git a/completions/checksec b/completions/checksec index deeb1be4b62..24d576f2bf4 100644 --- a/completions/checksec +++ b/completions/checksec @@ -3,7 +3,7 @@ _checksec() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --version | --help) diff --git a/completions/chgrp b/completions/chgrp index 4793a45779a..bc6c9a00be9 100644 --- a/completions/chgrp +++ b/completions/chgrp @@ -3,7 +3,7 @@ _chgrp() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return cur=${cur//\\\\/} diff --git a/completions/chkconfig b/completions/chkconfig index 8ff66376aab..3fa4435e3a4 100644 --- a/completions/chkconfig +++ b/completions/chkconfig @@ -3,7 +3,7 @@ _chkconfig() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --level=[1-6] | [1-6] | --list | --add | --del | --override) diff --git a/completions/chmod b/completions/chmod index 95b8278c8c5..8ad0af251c9 100644 --- a/completions/chmod +++ b/completions/chmod @@ -3,7 +3,7 @@ _chmod() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --version) diff --git a/completions/chown b/completions/chown index 1d746b7a26f..44cd88d7890 100644 --- a/completions/chown +++ b/completions/chown @@ -4,7 +4,7 @@ _chown() { local cur prev words cword split # Don't treat user:group as separate words. - _init_completion -s -n : || return + _comp_initialize -s -n : || return case "$prev" in --from) diff --git a/completions/chpasswd b/completions/chpasswd index 3abea9981dd..5d1ec5ecca3 100644 --- a/completions/chpasswd +++ b/completions/chpasswd @@ -3,7 +3,7 @@ _chpasswd() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --crypt | -!(-*)c) diff --git a/completions/chromium-browser b/completions/chromium-browser index 9ee989629e5..2e1508daecb 100644 --- a/completions/chromium-browser +++ b/completions/chromium-browser @@ -3,7 +3,7 @@ _chromium_browser() { local cur prev words cword split - _init_completion -s -n : || return + _comp_initialize -s -n : || return case $prev in --help | --app | --proxy-pac-url | -h) diff --git a/completions/chronyc b/completions/chronyc index 27bd8ef961e..4d8279ff9dd 100644 --- a/completions/chronyc +++ b/completions/chronyc @@ -16,7 +16,7 @@ _chronyc_command_args() _chronyc() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | -*p) diff --git a/completions/chrpath b/completions/chrpath index 2883967b1f9..5239c3e4ec7 100644 --- a/completions/chrpath +++ b/completions/chrpath @@ -3,7 +3,7 @@ _chrpath() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --version | --help | -!(-*)[vh]) diff --git a/completions/cksfv b/completions/cksfv index da404ddadab..d375343000f 100644 --- a/completions/cksfv +++ b/completions/cksfv @@ -3,7 +3,7 @@ _cksfv() { local cur prev words cword - _init_completion || return + _comp_initialize || return if ((cword == 1)); then COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur")) diff --git a/completions/cleanarch b/completions/cleanarch index 0f7d5f5722a..19828164480 100644 --- a/completions/cleanarch +++ b/completions/cleanarch @@ -3,7 +3,7 @@ _cleanarch() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--status --dry-run --quiet --help' \ diff --git a/completions/clisp b/completions/clisp index c4259a00dd8..be2094bded8 100644 --- a/completions/clisp +++ b/completions/clisp @@ -5,7 +5,7 @@ _clisp() { local cur prev words cword - _init_completion || return + _comp_initialize || return # completing an option (may or may not be separated by a space) if [[ $cur == -* ]]; then diff --git a/completions/clone_member b/completions/clone_member index d99fdeefbe8..4c9252239de 100644 --- a/completions/clone_member +++ b/completions/clone_member @@ -3,7 +3,7 @@ _clone_member() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -l | --listname) diff --git a/completions/complete b/completions/complete index 9bd28e9005e..c340c5de07a 100644 --- a/completions/complete +++ b/completions/complete @@ -3,7 +3,7 @@ _complete() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*o) diff --git a/completions/config_list b/completions/config_list index 0cacbd1174d..f29ba779d6c 100644 --- a/completions/config_list +++ b/completions/config_list @@ -3,7 +3,7 @@ _config_list() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -i | -o | --inputfile | --outputfile) diff --git a/completions/configure b/completions/configure index f2b4f5d9bb4..32d2c9ff6ec 100644 --- a/completions/configure +++ b/completions/configure @@ -3,7 +3,7 @@ _configure() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -h | --help | -V | --version | --program-prefix | --program-suffix | \ diff --git a/completions/convert b/completions/convert index a2d95cd107c..d4a780385e6 100644 --- a/completions/convert +++ b/completions/convert @@ -130,7 +130,7 @@ _ImageMagick() _convert() { local cur prev words cword - _init_completion || return + _comp_initialize || return _ImageMagick && return @@ -149,7 +149,7 @@ _convert() _mogrify() { local cur prev words cword - _init_completion || return + _comp_initialize || return _ImageMagick && return @@ -167,7 +167,7 @@ _mogrify() _display() { local cur prev words cword - _init_completion || return + _comp_initialize || return _ImageMagick && return @@ -185,7 +185,7 @@ _display() _animate() { local cur prev words cword - _init_completion || return + _comp_initialize || return _ImageMagick && return @@ -203,7 +203,7 @@ _animate() _identify() { local cur prev words cword - _init_completion || return + _comp_initialize || return _ImageMagick && return @@ -220,7 +220,7 @@ _identify() _montage() { local cur prev words cword - _init_completion || return + _comp_initialize || return _ImageMagick && return @@ -238,7 +238,7 @@ _montage() _composite() { local cur prev words cword - _init_completion || return + _comp_initialize || return _ImageMagick && return @@ -256,7 +256,7 @@ _composite() _compare() { local cur prev words cword - _init_completion || return + _comp_initialize || return _ImageMagick && return @@ -273,7 +273,7 @@ _compare() _conjure() { local cur prev words cword - _init_completion || return + _comp_initialize || return _ImageMagick && return @@ -290,7 +290,7 @@ _conjure() _import() { local cur prev words cword - _init_completion || return + _comp_initialize || return _ImageMagick && return @@ -307,7 +307,7 @@ _import() _stream() { local cur prev words cword - _init_completion || return + _comp_initialize || return _ImageMagick && return diff --git a/completions/cowsay b/completions/cowsay index 6ba1d0fb1b5..7a55fb76771 100644 --- a/completions/cowsay +++ b/completions/cowsay @@ -3,7 +3,7 @@ _cowsay() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -f) diff --git a/completions/cpan2dist b/completions/cpan2dist index b5e59dae9f9..b9b8cf649d1 100644 --- a/completions/cpan2dist +++ b/completions/cpan2dist @@ -3,7 +3,7 @@ _cpan2dist() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --format) diff --git a/completions/cpio b/completions/cpio index d6fde0c361b..4280322827c 100644 --- a/completions/cpio +++ b/completions/cpio @@ -3,7 +3,7 @@ _cpio() { local cur prev words cword split - _init_completion -s -n : || return + _comp_initialize -s -n : || return # --name value style option case $prev in diff --git a/completions/cppcheck b/completions/cppcheck index 01cd1138c6e..1b80384e765 100644 --- a/completions/cppcheck +++ b/completions/cppcheck @@ -3,7 +3,7 @@ _cppcheck() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --append | --exitcode-suppressions | --rule-file | --config-excludes-file | \ diff --git a/completions/crontab b/completions/crontab index 672220da35d..d12590ad4e3 100644 --- a/completions/crontab +++ b/completions/crontab @@ -3,7 +3,7 @@ _crontab() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*u) diff --git a/completions/cryptsetup b/completions/cryptsetup index 7a97dfd86ea..374ac7e5316 100644 --- a/completions/cryptsetup +++ b/completions/cryptsetup @@ -14,7 +14,7 @@ _cryptsetup_device() _cryptsetup() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --version | --cipher | --hash | --*-size | --key-slot | --size | --offset | \ diff --git a/completions/curl b/completions/curl index e5f29b0d5ce..eb8811ec880 100644 --- a/completions/curl +++ b/completions/curl @@ -3,7 +3,7 @@ _curl() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --abstract-unix-socket | --alt-svc | --config | --cookie | \ diff --git a/completions/cvs b/completions/cvs index e3ab85a5951..11ac5146c06 100644 --- a/completions/cvs +++ b/completions/cvs @@ -50,7 +50,7 @@ _comp_deprecate_func _cvs_roots _comp_xfunc_cvs_roots _cvs() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return local count mode i cvsroot cvsroots pwd local -a flags files entries changed newremoved diff --git a/completions/cvsps b/completions/cvsps index f18826bd44f..ef0003b93c5 100644 --- a/completions/cvsps +++ b/completions/cvsps @@ -3,7 +3,7 @@ _cvsps() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return case $prev in -h | -z | -f | -d | -l | --diff-opts | --debuglvl) diff --git a/completions/dd b/completions/dd index 04d876a0f55..916d99d18af 100644 --- a/completions/dd +++ b/completions/dd @@ -3,7 +3,7 @@ _dd() { local cur prev words cword - _init_completion -n = || return + _comp_initialize -n = || return case $cur in if=* | of=*) diff --git a/completions/declare b/completions/declare index 38a101ed977..1a99324f8dd 100644 --- a/completions/declare +++ b/completions/declare @@ -3,7 +3,7 @@ _comp_cmd_declare() { local cur prev words cword - _init_completion -n := || return + _comp_initialize -n := || return if [[ $cur == [-+]* ]]; then local opts diff --git a/completions/deja-dup b/completions/deja-dup index 1854d6a40e5..c532fc54f28 100644 --- a/completions/deja-dup +++ b/completions/deja-dup @@ -3,7 +3,7 @@ _deja_dup() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -'?' | --help | --help-*) diff --git a/completions/desktop-file-validate b/completions/desktop-file-validate index 8f4e139d022..d3c3902734e 100644 --- a/completions/desktop-file-validate +++ b/completions/desktop-file-validate @@ -3,7 +3,7 @@ _desktop_file_validate() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help) diff --git a/completions/dhclient b/completions/dhclient index ce4b745262c..6e73fe1f89d 100644 --- a/completions/dhclient +++ b/completions/dhclient @@ -3,7 +3,7 @@ _dhclient() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -p | -e) diff --git a/completions/dict b/completions/dict index 7e8396da501..71ada3f6c59 100644 --- a/completions/dict +++ b/completions/dict @@ -9,7 +9,7 @@ _dictdata() _dict() { local cur prev words cword - _init_completion || return + _comp_initialize || return local host port db i diff --git a/completions/dmypy b/completions/dmypy index 3c37137fb14..43516c21686 100644 --- a/completions/dmypy +++ b/completions/dmypy @@ -3,7 +3,7 @@ _dmypy() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version | -[hV]) diff --git a/completions/dnssec-keygen b/completions/dnssec-keygen index 3f68a687389..ae3ac6c675a 100644 --- a/completions/dnssec-keygen +++ b/completions/dnssec-keygen @@ -12,7 +12,7 @@ _dnssec_keygen_optarg() _dnssec_keygen() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -[hbEgLpsPARIDSi]) diff --git a/completions/dnsspoof b/completions/dnsspoof index 86ade91db39..6187b5fbf2a 100644 --- a/completions/dnsspoof +++ b/completions/dnsspoof @@ -3,7 +3,7 @@ _dnsspoof() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -i) diff --git a/completions/dot b/completions/dot index 4a6e114fab9..d70d191d22e 100644 --- a/completions/dot +++ b/completions/dot @@ -3,7 +3,7 @@ _dot() { local cur prev words cword - _init_completion -n := || return + _comp_initialize -n := || return [[ $prev == -[V?] ]] && return diff --git a/completions/dpkg b/completions/dpkg index fd7b5dbe624..9062c34fcef 100644 --- a/completions/dpkg +++ b/completions/dpkg @@ -38,7 +38,7 @@ _comp_deprecate_func _comp_dpkg_purgeable_packages _comp_xfunc_dpkg_purgeable_pa _dpkg() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local i=$cword @@ -127,7 +127,7 @@ _dpkg() _dpkg_reconfigure() { local cur prev words cword - _init_completion || return + _comp_initialize || return local opt diff --git a/completions/dpkg-source b/completions/dpkg-source index 05fa3a1116f..d9225fbd6c6 100644 --- a/completions/dpkg-source +++ b/completions/dpkg-source @@ -3,7 +3,7 @@ _dpkg_source() { local cur prev words cword - _init_completion || return + _comp_initialize || return local options word action packopts unpackopts fields diff --git a/completions/dselect b/completions/dselect index 4c1802671a2..660374f451f 100644 --- a/completions/dselect +++ b/completions/dselect @@ -3,7 +3,7 @@ _dselect() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --admindir) diff --git a/completions/dsniff b/completions/dsniff index 749c533cbfb..9e01545efef 100644 --- a/completions/dsniff +++ b/completions/dsniff @@ -3,7 +3,7 @@ _dsniff() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -r | -w | -f | -p) diff --git a/completions/dumpdb b/completions/dumpdb index eb1927fa044..210b7bf450a 100644 --- a/completions/dumpdb +++ b/completions/dumpdb @@ -3,7 +3,7 @@ _dumpdb() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--marshal --pickle --noprint --help' \ diff --git a/completions/dumpe2fs b/completions/dumpe2fs index 413a5bf6745..71c9dbc6681 100644 --- a/completions/dumpe2fs +++ b/completions/dumpe2fs @@ -3,7 +3,7 @@ _dumpe2fs() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*[oV]) diff --git a/completions/e2freefrag b/completions/e2freefrag index c89dc9cbc8b..8683ec282b2 100644 --- a/completions/e2freefrag +++ b/completions/e2freefrag @@ -3,7 +3,7 @@ _e2freefrag() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -c | -h) diff --git a/completions/e2label b/completions/e2label index ac8e4b5f718..2cb66816f35 100644 --- a/completions/e2label +++ b/completions/e2label @@ -3,7 +3,7 @@ _e2label() { local cur prev words cword - _init_completion || return + _comp_initialize || return if ((cword == 1)); then cur=${cur:=/dev/} diff --git a/completions/ebtables b/completions/ebtables index 0a0042de737..e1a8d1f3779 100644 --- a/completions/ebtables +++ b/completions/ebtables @@ -3,7 +3,7 @@ _ebtables() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local table chain='s/^Bridge chain: \([^ ,]\{1,\}\).*$/\1/p' \ targets='ACCEPT DROP CONTINUE RETURN' diff --git a/completions/ecryptfs-migrate-home b/completions/ecryptfs-migrate-home index d2eeb381bb7..0c4cd6e847b 100644 --- a/completions/ecryptfs-migrate-home +++ b/completions/ecryptfs-migrate-home @@ -3,7 +3,7 @@ _ecryptfs_migrate_home() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help) diff --git a/completions/eog b/completions/eog index 2330e1a2146..4611617220a 100644 --- a/completions/eog +++ b/completions/eog @@ -3,7 +3,7 @@ _eog() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -'?' | --help | --help-all | --help-gtk) diff --git a/completions/ether-wake b/completions/ether-wake index d9526736cea..71ca4372138 100644 --- a/completions/ether-wake +++ b/completions/ether-wake @@ -3,7 +3,7 @@ _ether_wake() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return case $prev in -i) diff --git a/completions/evince b/completions/evince index 17fec24d729..d072a3395c7 100644 --- a/completions/evince +++ b/completions/evince @@ -3,7 +3,7 @@ _evince() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help* | --sm-client-id | --class | --name | --screen | --gdk-debug | \ diff --git a/completions/export b/completions/export index 4e06f0eb978..a23e87bd351 100644 --- a/completions/export +++ b/completions/export @@ -3,7 +3,7 @@ _export() { local cur prev words cword - _init_completion -n := || return + _comp_initialize -n := || return local i action=variable remove=false for ((i = 1; i < cword; i++)); do diff --git a/completions/faillog b/completions/faillog index c8b81bd07ea..5d65584828e 100644 --- a/completions/faillog +++ b/completions/faillog @@ -3,7 +3,7 @@ _faillog() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --lock-time | --maximum | --time | -!(-*)[hlmt]) diff --git a/completions/fbgs b/completions/fbgs index 1947b872c58..541004341e6 100644 --- a/completions/fbgs +++ b/completions/fbgs @@ -3,7 +3,7 @@ _fbgs() { local cur prev words cword - _init_completion || return + _comp_initialize || return case "$prev" in -f | --font) diff --git a/completions/fbi b/completions/fbi index 455887a3738..039dda34c97 100644 --- a/completions/fbi +++ b/completions/fbi @@ -3,7 +3,7 @@ _fbi() { local cur prev words cword - _init_completion || return + _comp_initialize || return case "$prev" in -l | --list) diff --git a/completions/feh b/completions/feh index 0b15f8fd2ec..3b57194c68f 100644 --- a/completions/feh +++ b/completions/feh @@ -3,7 +3,7 @@ _feh() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case "$prev" in --image-bg | -B) diff --git a/completions/file b/completions/file index 21fbd161f47..ad7aebe9fd4 100644 --- a/completions/file +++ b/completions/file @@ -3,7 +3,7 @@ _file() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version | --separator | -!(-*)[vF]) diff --git a/completions/file-roller b/completions/file-roller index 27d23dfb1ea..e6a994d0806 100644 --- a/completions/file-roller +++ b/completions/file-roller @@ -3,7 +3,7 @@ _file_roller() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local exts='@(7z?(.001)|ace|alz|ar|arj|[bglx]z|bz2|tb?(z)2|cab|cb[rz]|iso?(9660)|Z|t[abglx]z|cpio|deb|rar|?(g)tar|gem|lh[az]|lz[4h]|?(t)lrz|lzma|lzo|wim|swm|rpm|sit|zoo)' diff --git a/completions/filefrag b/completions/filefrag index d26e8c8a234..5f363e2c2bb 100644 --- a/completions/filefrag +++ b/completions/filefrag @@ -3,7 +3,7 @@ _filefrag() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur")) diff --git a/completions/filesnarf b/completions/filesnarf index f959d80fc73..d4f179b07b9 100644 --- a/completions/filesnarf +++ b/completions/filesnarf @@ -3,7 +3,7 @@ _snarf() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -i) diff --git a/completions/find b/completions/find index 685fe4a3398..69bc063be5e 100644 --- a/completions/find +++ b/completions/find @@ -5,7 +5,7 @@ _find() { local cur prev words cword - _init_completion || return + _comp_initialize || return local i for i in ${!words[*]}; do diff --git a/completions/find_member b/completions/find_member index 5b352d580f9..cc680f61f8b 100644 --- a/completions/find_member +++ b/completions/find_member @@ -3,7 +3,7 @@ _find_member() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -l | -x | --listname | --exclude) diff --git a/completions/fio b/completions/fio index 5d916bc52be..d49d62d03a4 100644 --- a/completions/fio +++ b/completions/fio @@ -10,7 +10,7 @@ _comp_cmd_fio__engines() _fio() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local ret case $prev in diff --git a/completions/firefox b/completions/firefox index c9e1c0442b7..fcb89c192cb 100644 --- a/completions/firefox +++ b/completions/firefox @@ -3,7 +3,7 @@ _firefox() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return [[ $cur == -MOZ_LOG*=* ]] && prev=${cur%%=*} cur=${cur#*=} diff --git a/completions/flake8 b/completions/flake8 index 045c40954c5..0ac82de13eb 100644 --- a/completions/flake8 +++ b/completions/flake8 @@ -3,7 +3,7 @@ _flake8() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --version | -!(-*)h) diff --git a/completions/freebsd-update b/completions/freebsd-update index d5be861292f..e8a8f06ff0d 100644 --- a/completions/freebsd-update +++ b/completions/freebsd-update @@ -5,7 +5,7 @@ _freebsd_update() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -b | -d) diff --git a/completions/freeciv b/completions/freeciv index 01af31182de..f1998b07846 100644 --- a/completions/freeciv +++ b/completions/freeciv @@ -3,7 +3,7 @@ _freeciv() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version | --name | --port | -[hvnp]) diff --git a/completions/freeciv-server b/completions/freeciv-server index a34b5a29fe5..98d9b627e3a 100644 --- a/completions/freeciv-server +++ b/completions/freeciv-server @@ -3,7 +3,7 @@ _civserver() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -f | -g | -l | -r | --file | --log | --gamelog | --read) diff --git a/completions/function b/completions/function index f19646f6a7d..2482f931572 100644 --- a/completions/function +++ b/completions/function @@ -3,7 +3,7 @@ _function() { local cur prev words cword - _init_completion || return + _comp_initialize || return if ((cword == 1)); then COMPREPLY=($(compgen -A function -- "$cur")) diff --git a/completions/fusermount b/completions/fusermount index 7e4892259b0..2890d6c2621 100644 --- a/completions/fusermount +++ b/completions/fusermount @@ -3,7 +3,7 @@ _fusermount() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*[hVo]) diff --git a/completions/gcc b/completions/gcc index 41913b01164..3dacd94ab93 100644 --- a/completions/gcc +++ b/completions/gcc @@ -3,7 +3,7 @@ _gcc() { local cur prev prev2 words cword argument prefix prefix_length - _init_completion || return + _comp_initialize || return # Test that GCC is recent enough and if not fallback to # parsing of --completion option. diff --git a/completions/gcl b/completions/gcl index 73a18b2d732..e9e697aa73c 100644 --- a/completions/gcl +++ b/completions/gcl @@ -5,7 +5,7 @@ _gcl() { local cur prev words cword - _init_completion || return + _comp_initialize || return # completing an option (may or may not be separated by a space) if [[ $cur == -* ]]; then diff --git a/completions/gdb b/completions/gdb index 33849a779b7..adc74263973 100644 --- a/completions/gdb +++ b/completions/gdb @@ -3,7 +3,7 @@ _gdb() { local cur prev words cword i - _init_completion || return + _comp_initialize || return # gdb [options] --args executable-file [inferior-arguments ...] for ((i = 1; i < cword; i++)); do diff --git a/completions/genaliases b/completions/genaliases index 5953b9efd70..408db65d131 100644 --- a/completions/genaliases +++ b/completions/genaliases @@ -3,7 +3,7 @@ _genaliases() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--quiet --help' -- "$cur")) diff --git a/completions/gendiff b/completions/gendiff index d37793f60cb..cf3a6bab253 100644 --- a/completions/gendiff +++ b/completions/gendiff @@ -3,7 +3,7 @@ _gendiff() { local cur prev words cword - _init_completion -o '@(diff|patch)' || return + _comp_initialize -o '@(diff|patch)' || return ((cword == 1)) && _filedir -d } && diff --git a/completions/genisoimage b/completions/genisoimage index dfa39c0ab21..6e0dd45b462 100644 --- a/completions/genisoimage +++ b/completions/genisoimage @@ -3,7 +3,7 @@ _mkisofs() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -o | -abstract | -biblio | -check-session | -copyright | -log-file | \ diff --git a/completions/geoiplookup b/completions/geoiplookup index c60be8986eb..9daad394574 100644 --- a/completions/geoiplookup +++ b/completions/geoiplookup @@ -3,7 +3,7 @@ _geoiplookup() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h | -'?' | -v) diff --git a/completions/getconf b/completions/getconf index de1ad2d66ee..1c3d18a78b0 100644 --- a/completions/getconf +++ b/completions/getconf @@ -3,7 +3,7 @@ _getconf() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -a) diff --git a/completions/getent b/completions/getent index 4c54a242447..2969c218008 100644 --- a/completions/getent +++ b/completions/getent @@ -3,7 +3,7 @@ _getent() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local i db for ((i = 1; i < cword; i++)); do diff --git a/completions/gkrellm b/completions/gkrellm index c38c5ae143a..df393c4d18a 100644 --- a/completions/gkrellm +++ b/completions/gkrellm @@ -3,7 +3,7 @@ _gkrellm() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -t | --theme) diff --git a/completions/gm b/completions/gm index 43045f12656..a0611847287 100644 --- a/completions/gm +++ b/completions/gm @@ -9,7 +9,7 @@ _gm_commands() _gm() { local cur prev words cword - _init_completion || return + _comp_initialize || return if ((cword == 1)); then _gm_commands "$1" diff --git a/completions/gnatmake b/completions/gnatmake index 5f4b96397d3..1d65528d9dd 100644 --- a/completions/gnatmake +++ b/completions/gnatmake @@ -4,7 +4,7 @@ _gnatmake() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then # relevant (and less relevant ;-) )options completion diff --git a/completions/gnokii b/completions/gnokii index 039141aecdd..37fb64aec81 100644 --- a/completions/gnokii +++ b/completions/gnokii @@ -9,7 +9,7 @@ _gnokii_memory_type() _gnokii() { local cur prev words cword pprev tprev fprev - _init_completion || return + _comp_initialize || return case $prev in --config) diff --git a/completions/gnome-mplayer b/completions/gnome-mplayer index 32d93fc3b01..c95b91994bf 100644 --- a/completions/gnome-mplayer +++ b/completions/gnome-mplayer @@ -3,7 +3,7 @@ _gnome_mplayer() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -'?' | --help | --help-all | --help-gtk) diff --git a/completions/gnome-screenshot b/completions/gnome-screenshot index b3594d203d1..99c706eaa52 100644 --- a/completions/gnome-screenshot +++ b/completions/gnome-screenshot @@ -3,7 +3,7 @@ _gnome_screenshot() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --help-* | --version | --delay | --display | -!(-*)[hd]) diff --git a/completions/gpasswd b/completions/gpasswd index f1f22003003..7ba14bda663 100644 --- a/completions/gpasswd +++ b/completions/gpasswd @@ -3,7 +3,7 @@ _gpasswd() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --add | --delete | --administrators | --members | -!(-*)[adAM]) diff --git a/completions/gpg b/completions/gpg index f0ca8845393..cbce5146e57 100644 --- a/completions/gpg +++ b/completions/gpg @@ -3,7 +3,7 @@ _gpg() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --sign | --clearsign | --decrypt-files | --load-extension | -!(-*)s) diff --git a/completions/gpg2 b/completions/gpg2 index cfa402318f4..1de46a63a5d 100644 --- a/completions/gpg2 +++ b/completions/gpg2 @@ -3,7 +3,7 @@ _gpg2() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --homedir) diff --git a/completions/gpgv b/completions/gpgv index 29315c9c2f9..562fbcb49a7 100644 --- a/completions/gpgv +++ b/completions/gpgv @@ -3,7 +3,7 @@ _gpgv() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version | --weak-digest | --*-fd | -!(-*)[?h]*) diff --git a/completions/gphoto2 b/completions/gphoto2 index cbf84c0a3d2..59f9863adcf 100644 --- a/completions/gphoto2 +++ b/completions/gphoto2 @@ -3,7 +3,7 @@ _gphoto2() { local cur prev words cword split - _init_completion -s -n : || return + _comp_initialize -s -n : || return case $prev in --debug-logfile) diff --git a/completions/gprof b/completions/gprof index 5a4ab2d4dfd..0ba425c1841 100644 --- a/completions/gprof +++ b/completions/gprof @@ -3,7 +3,7 @@ _gprof() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $cur in -A* | -C* | -J* | -p* | -P* | -q* | -Q* | -n* | -N* | -d*) diff --git a/completions/groupadd b/completions/groupadd index 5f67f2996bf..078b913702a 100644 --- a/completions/groupadd +++ b/completions/groupadd @@ -3,7 +3,7 @@ _groupadd() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return # TODO: if -o/--non-unique is given, could complete on existing gids # with -g/--gid diff --git a/completions/groupdel b/completions/groupdel index 4d8ca7f726e..5ca48faea27 100644 --- a/completions/groupdel +++ b/completions/groupdel @@ -3,7 +3,7 @@ _groupdel() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h | --help) diff --git a/completions/groupmems b/completions/groupmems index 2e89a5ab40c..9011266196d 100644 --- a/completions/groupmems +++ b/completions/groupmems @@ -3,7 +3,7 @@ _groupmems() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -a | --add | -d | --delete) diff --git a/completions/groupmod b/completions/groupmod index 5516d31c9bc..901ddc0807a 100644 --- a/completions/groupmod +++ b/completions/groupmod @@ -3,7 +3,7 @@ _groupmod() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return # TODO: if -o/--non-unique is given, could complete on existing gids # with -g/--gid diff --git a/completions/growisofs b/completions/growisofs index ee09fe6c7d8..9b237275f0f 100644 --- a/completions/growisofs +++ b/completions/growisofs @@ -3,7 +3,7 @@ _growisofs() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -version | -speed) diff --git a/completions/grpck b/completions/grpck index a909774f2d7..71e83c46236 100644 --- a/completions/grpck +++ b/completions/grpck @@ -3,7 +3,7 @@ _grpck() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --root | -!(-*)R) diff --git a/completions/gssdp-discover b/completions/gssdp-discover index 6ed678b4851..1648817057c 100644 --- a/completions/gssdp-discover +++ b/completions/gssdp-discover @@ -3,7 +3,7 @@ _gssdp_discover() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --target | --timeout | --rescan-interval | -[htnr]) diff --git a/completions/gzip b/completions/gzip index 786cb8b2650..a2882571d2b 100644 --- a/completions/gzip +++ b/completions/gzip @@ -3,7 +3,7 @@ _gzip() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --blocksize | --suffix | --help | --version | --alias | --comment | \ diff --git a/completions/hcitool b/completions/hcitool index 14ae05c60e1..72ddaa743dd 100644 --- a/completions/hcitool +++ b/completions/hcitool @@ -30,7 +30,7 @@ _bluetooth_packet_types() _hcitool() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -i) @@ -110,7 +110,7 @@ _hcitool() _sdptool() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --bdaddr) @@ -168,7 +168,7 @@ _sdptool() _l2ping() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -i) @@ -191,7 +191,7 @@ _l2ping() _rfcomm() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -f | --config) @@ -235,7 +235,7 @@ _rfcomm() _ciptool() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -i) @@ -271,7 +271,7 @@ _ciptool() _dfutool() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -d | --device) @@ -301,7 +301,7 @@ _dfutool() _hciconfig() { local cur prev words cword - _init_completion || return + _comp_initialize || return local arg _get_first_arg @@ -345,7 +345,7 @@ _hciconfig() _hciattach() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '-n -p -t -b -s -l' -- "$cur")) diff --git a/completions/hddtemp b/completions/hddtemp index 7b95f0eecbc..8a927f70475 100644 --- a/completions/hddtemp +++ b/completions/hddtemp @@ -3,7 +3,7 @@ _hddtemp() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --file | -!(-*)f) diff --git a/completions/hid2hci b/completions/hid2hci index f33a49575e5..b24a5604141 100644 --- a/completions/hid2hci +++ b/completions/hid2hci @@ -3,7 +3,7 @@ _hid2hci() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--help --quiet -0 --tohci -1 --tohid' \ diff --git a/completions/hostname b/completions/hostname index 00dd6a06fe3..0cdc28c7a2b 100644 --- a/completions/hostname +++ b/completions/hostname @@ -3,7 +3,7 @@ _hostname() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version | -!(-*)[hV]) diff --git a/completions/hping2 b/completions/hping2 index 666838b1acc..55871bbbf50 100644 --- a/completions/hping2 +++ b/completions/hping2 @@ -3,7 +3,7 @@ _hping2() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --interface | -!(-*)I) diff --git a/completions/htop b/completions/htop index b4916d5bfec..b9f317401ea 100644 --- a/completions/htop +++ b/completions/htop @@ -3,7 +3,7 @@ _htop() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case "$prev" in --sort-key | -!(-*)s) diff --git a/completions/htpasswd b/completions/htpasswd index 527684bf3a0..1b9427eeec2 100644 --- a/completions/htpasswd +++ b/completions/htpasswd @@ -3,7 +3,7 @@ _htpasswd() { local cur prev words cword - _init_completion || return + _comp_initialize || return local i o=0 # $o is index of first non-option argument for ((i = 1; i <= cword; i++)); do diff --git a/completions/hunspell b/completions/hunspell index 44f04b540ac..0b688af3e74 100644 --- a/completions/hunspell +++ b/completions/hunspell @@ -3,7 +3,7 @@ _hunspell() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version | -vv | -[hPv]) diff --git a/completions/iconv b/completions/iconv index 799065b744c..8846bc062a2 100644 --- a/completions/iconv +++ b/completions/iconv @@ -11,7 +11,7 @@ _comp_deprecate_func _iconv_charsets _comp_xfunc_iconv_charsets _iconv() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --usage | --version | --unicode-subst | --byte-subst | \ diff --git a/completions/id b/completions/id index a07e51dc528..af6678ad422 100644 --- a/completions/id +++ b/completions/id @@ -3,7 +3,7 @@ _id() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then local opts=$(_parse_help "$1") diff --git a/completions/idn b/completions/idn index 8023f8fdc27..1e3ac0c1709 100644 --- a/completions/idn +++ b/completions/idn @@ -3,7 +3,7 @@ _idn() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --version | -!(-*)[hV]) diff --git a/completions/ifstat b/completions/ifstat index be29cbfc076..0c78a92bcd9 100644 --- a/completions/ifstat +++ b/completions/ifstat @@ -3,7 +3,7 @@ _ifstat() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --version | --scan | --interval | -!(-*)[hvV]) diff --git a/completions/iftop b/completions/iftop index b73f4b6b811..890fd34b45a 100644 --- a/completions/iftop +++ b/completions/iftop @@ -3,7 +3,7 @@ _iftop() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h | -f | -F | -m) diff --git a/completions/ifup b/completions/ifup index 4feb3ffed9b..acda79a7731 100644 --- a/completions/ifup +++ b/completions/ifup @@ -5,7 +5,7 @@ _comp_userland GNU || return 1 _ifupdown() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version | --allow | --exclude | --option | -!(-*)[hVXo]) diff --git a/completions/influx b/completions/influx index e9362e7ef91..b4a39ee13d3 100644 --- a/completions/influx +++ b/completions/influx @@ -3,7 +3,7 @@ _influx() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -version | -port | -database | -password | -username | -execute | -pps) diff --git a/completions/info b/completions/info index cba5e8ea514..80111389f21 100644 --- a/completions/info +++ b/completions/info @@ -3,7 +3,7 @@ _info() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return # default completion if parameter looks like a path if [[ $cur == @(*/|[.~])* ]]; then diff --git a/completions/inject b/completions/inject index adaf67f0c7f..c78178d601a 100644 --- a/completions/inject +++ b/completions/inject @@ -3,7 +3,7 @@ _inject() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -l | --listname) diff --git a/completions/inotifywait b/completions/inotifywait index e5608fc6432..812807a4f94 100644 --- a/completions/inotifywait +++ b/completions/inotifywait @@ -14,7 +14,7 @@ _inotifywait_events() _inotifywait() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --exclude | --excludei | --format | --timefmt | --timeout | -!(-*)[ht]) diff --git a/completions/insmod b/completions/insmod index 2f756a99ca8..5b784cbc7bd 100644 --- a/completions/insmod +++ b/completions/insmod @@ -3,7 +3,7 @@ _insmod() { local cur prev words cword - _init_completion || return + _comp_initialize || return # do filename completion for first argument if ((cword == 1)); then diff --git a/completions/installpkg b/completions/installpkg index 7455eb10d31..c55e5bddf55 100644 --- a/completions/installpkg +++ b/completions/installpkg @@ -3,7 +3,7 @@ _installpkg() { local cur prev words cword - _init_completion || return + _comp_initialize || return case "$prev" in --root) diff --git a/completions/interdiff b/completions/interdiff index 9933d15db54..0ab11ad65f0 100644 --- a/completions/interdiff +++ b/completions/interdiff @@ -3,7 +3,7 @@ _interdiff() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --unified | --strip-match | --drop-context | -!(-*)[Upd]) diff --git a/completions/invoke-rc.d b/completions/invoke-rc.d index 56163998981..3a6dfbf7250 100644 --- a/completions/invoke-rc.d +++ b/completions/invoke-rc.d @@ -5,7 +5,7 @@ _invoke_rc_d() { local cur prev words cword - _init_completion || return + _comp_initialize || return local sysvdir services options valid_options diff --git a/completions/ip b/completions/ip index 93403bc2f78..209a0e290a6 100644 --- a/completions/ip +++ b/completions/ip @@ -10,7 +10,7 @@ _iproute2_etc() _ip() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -V | -Version | -rc | -rcvbuf) diff --git a/completions/ipcalc b/completions/ipcalc index 5603c26cea0..ed65fb8ae32 100644 --- a/completions/ipcalc +++ b/completions/ipcalc @@ -3,7 +3,7 @@ _ipcalc() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version | --split | -[hs]) diff --git a/completions/iperf b/completions/iperf index c9145bf08ea..9017325bc07 100644 --- a/completions/iperf +++ b/completions/iperf @@ -3,7 +3,7 @@ _iperf() { local cur prev words cword split - _init_completion -s -n : || return + _comp_initialize -s -n : || return case $prev in --help | --version | --interval | --len | --port | --window | --mss | --bandwidth | \ diff --git a/completions/ipmitool b/completions/ipmitool index bb65d8f86aa..9cf32fd23d8 100644 --- a/completions/ipmitool +++ b/completions/ipmitool @@ -9,7 +9,7 @@ _ipmitool_singleline_help() _ipmitool() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*[hVpUekyPmbtBTl]) diff --git a/completions/ipsec b/completions/ipsec index 49977bb5df0..179b61b76c2 100644 --- a/completions/ipsec +++ b/completions/ipsec @@ -17,7 +17,7 @@ _ipsec_connections() _ipsec_freeswan() { local cur prev words cword - _init_completion || return + _comp_initialize || return if ((cword == 1)); then COMPREPLY=($(compgen -W 'auto barf eroute klipsdebug look manual @@ -50,7 +50,7 @@ _ipsec_freeswan() _ipsec_strongswan() { local cur prev words cword - _init_completion || return + _comp_initialize || return if ((cword == 1)); then COMPREPLY=($(compgen -W 'down irdumm leases listaacerts listacerts diff --git a/completions/iptables b/completions/iptables index 6c564f5a6ce..339cecf438b 100644 --- a/completions/iptables +++ b/completions/iptables @@ -3,7 +3,7 @@ _iptables() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local table chain='s/^Chain \([^ ]\{1,\}\).*$/\1/p' diff --git a/completions/ipv6calc b/completions/ipv6calc index c452c155e12..c6565901f86 100644 --- a/completions/ipv6calc +++ b/completions/ipv6calc @@ -3,7 +3,7 @@ _ipv6calc() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case "$prev" in --debug | -!(-*)d) diff --git a/completions/iscsiadm b/completions/iscsiadm index 7786ddcd958..b3399bc387b 100644 --- a/completions/iscsiadm +++ b/completions/iscsiadm @@ -3,7 +3,7 @@ _iscsiadm() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --mode | -!(-*)m) diff --git a/completions/isort b/completions/isort index 2a84e257587..5dc052ec76e 100644 --- a/completions/isort +++ b/completions/isort @@ -3,7 +3,7 @@ _isort() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --add-import | --builtin | --future | --from-first | -ff | \ diff --git a/completions/isql b/completions/isql index 4258c519d86..d49f3f530ac 100644 --- a/completions/isql +++ b/completions/isql @@ -4,7 +4,7 @@ _isql() { local cur prev words cword - _init_completion || return + _comp_initialize || return [[ -f $ODBCINI ]] && COMPREPLY=($(command grep "\[$cur" "$ODBCINI" | tr -d \[\])) diff --git a/completions/iwconfig b/completions/iwconfig index 9b439f78e41..983cd6c0571 100644 --- a/completions/iwconfig +++ b/completions/iwconfig @@ -3,7 +3,7 @@ _iwconfig() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in mode) diff --git a/completions/iwlist b/completions/iwlist index 16aa39c908a..08359219cf7 100644 --- a/completions/iwlist +++ b/completions/iwlist @@ -3,7 +3,7 @@ _iwlist() { local cur prev words cword - _init_completion || return + _comp_initialize || return if ((cword == 1)); then if [[ $cur == -* ]]; then diff --git a/completions/iwpriv b/completions/iwpriv index 4e382463d5e..cb13cbcb961 100644 --- a/completions/iwpriv +++ b/completions/iwpriv @@ -3,7 +3,7 @@ _iwpriv() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in roam) diff --git a/completions/iwspy b/completions/iwspy index 38b7868ed22..5cd6bca61e2 100644 --- a/completions/iwspy +++ b/completions/iwspy @@ -3,7 +3,7 @@ _iwspy() { local cur prev words cword - _init_completion || return + _comp_initialize || return if ((cword == 1)); then if [[ $cur == -* ]]; then diff --git a/completions/jar b/completions/jar index 22894917969..3d5b3fc176c 100644 --- a/completions/jar +++ b/completions/jar @@ -3,7 +3,7 @@ _jar() { local cur prev words cword - _init_completion || return + _comp_initialize || return if ((cword == 1)); then COMPREPLY=($(compgen -W 'c t x u' -- "$cur")) diff --git a/completions/jarsigner b/completions/jarsigner index ccd5b4f5c96..a94bd842ba5 100644 --- a/completions/jarsigner +++ b/completions/jarsigner @@ -3,7 +3,7 @@ _jarsigner() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -keystore) diff --git a/completions/java b/completions/java index a26de1744d6..9806324d8c5 100644 --- a/completions/java +++ b/completions/java @@ -128,7 +128,7 @@ _java_packages() _java() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return local i @@ -242,7 +242,7 @@ _java() _javadoc() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -overview | -helpfile) @@ -289,7 +289,7 @@ _javadoc() _javac() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return case $prev in -d) diff --git a/completions/javaws b/completions/javaws index f42a1e55ef4..3e979453afe 100644 --- a/completions/javaws +++ b/completions/javaws @@ -3,7 +3,7 @@ _javaws() { local cur prev words cword - _init_completion -n = || return + _comp_initialize -n = || return case $prev in -help | -license | -about | -viewer | -arg | -param | -property | -update | -umask) diff --git a/completions/jpegoptim b/completions/jpegoptim index c36697217f4..0b8e9923a2e 100644 --- a/completions/jpegoptim +++ b/completions/jpegoptim @@ -3,7 +3,7 @@ _jpegoptim() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --version | -!(-*)[hV]*) diff --git a/completions/jps b/completions/jps index a451eec1bf7..83119dda9e5 100644 --- a/completions/jps +++ b/completions/jps @@ -3,7 +3,7 @@ _jps() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -J* | -help) diff --git a/completions/jq b/completions/jq index 3ffbeb28e6e..c8c1d9dc81a 100644 --- a/completions/jq +++ b/completions/jq @@ -3,7 +3,7 @@ _jq() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version | --arg | --argjson | --slurpfile | --argfile) diff --git a/completions/jshint b/completions/jshint index 3622cecfd87..cb9c8e719ac 100644 --- a/completions/jshint +++ b/completions/jshint @@ -3,7 +3,7 @@ _jshint() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -v | --version | -h | --help | --exclude | --filename | -e | --extra-ext) diff --git a/completions/json_xs b/completions/json_xs index c93ba864832..ee7c6290827 100644 --- a/completions/json_xs +++ b/completions/json_xs @@ -3,7 +3,7 @@ _json_xs() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*f) diff --git a/completions/jsonschema b/completions/jsonschema index 8a36ed364e4..dec7cfc7dbd 100644 --- a/completions/jsonschema +++ b/completions/jsonschema @@ -3,7 +3,7 @@ _jsonschema() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --error-format | --validator | -[hFV]) diff --git a/completions/k3b b/completions/k3b index 87d26cdc9cc..f202de05ac9 100644 --- a/completions/k3b +++ b/completions/k3b @@ -3,7 +3,7 @@ _k3b() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help* | --author | -v | --version | --license | --lang) diff --git a/completions/kcov b/completions/kcov index 672967afa02..e50b0b45ac1 100644 --- a/completions/kcov +++ b/completions/kcov @@ -3,7 +3,7 @@ _kcov() { local cur prev words cword split - _init_completion -s -n : || return + _comp_initialize -s -n : || return case "$prev" in --pid | -p) diff --git a/completions/kill b/completions/kill index 2b3a45aa317..13390f7a84a 100644 --- a/completions/kill +++ b/completions/kill @@ -3,7 +3,7 @@ _kill() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -s) diff --git a/completions/killall b/completions/killall index c7c0b0fc371..a8cf2dbf2ef 100644 --- a/completions/killall +++ b/completions/killall @@ -5,7 +5,7 @@ _killall() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --context | --older-than | --younger-than | --version | -!(-*)@([Zoy]|V*)) diff --git a/completions/kldload b/completions/kldload index 9079ec58434..9307a475788 100644 --- a/completions/kldload +++ b/completions/kldload @@ -5,7 +5,7 @@ _kldload() { local cur prev words cword - _init_completion || return + _comp_initialize || return if _comp_looks_like_path "$cur"; then _filedir ko diff --git a/completions/kldunload b/completions/kldunload index 2e12282c844..4d0ec37f8f1 100644 --- a/completions/kldunload +++ b/completions/kldunload @@ -5,7 +5,7 @@ _kldunload() { local cur prev words cword - _init_completion || return + _comp_initialize || return COMPREPLY=($(compgen -W '$(kldstat)' -X 'kernel' -X '!*.ko' -- "$cur")) COMPREPLY=(${COMPREPLY[@]%.ko}) diff --git a/completions/koji b/completions/koji index 8efef9a7fae..151149d9331 100644 --- a/completions/koji +++ b/completions/koji @@ -35,7 +35,7 @@ _koji_target() _koji() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local commandix command for ((commandix = 1; commandix < cword; commandix++)); do diff --git a/completions/ktutil b/completions/ktutil index 6030a474fec..80505775dd9 100644 --- a/completions/ktutil +++ b/completions/ktutil @@ -22,7 +22,7 @@ _heimdal_encodings() _ktutil() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local command commands i options diff --git a/completions/larch b/completions/larch index 7ed9ca20767..108addf1096 100644 --- a/completions/larch +++ b/completions/larch @@ -4,7 +4,7 @@ _larch() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cword -eq 1 || $prev == -* ]]; then COMPREPLY=($(compgen -W ' \ diff --git a/completions/lastlog b/completions/lastlog index 214a174d590..a0ed48b13e3 100644 --- a/completions/lastlog +++ b/completions/lastlog @@ -3,7 +3,7 @@ _lastlog() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --before | --help | --time | -!(-*)@([bt]|h*)) diff --git a/completions/ldapsearch b/completions/ldapsearch index 6dc415e66e1..3cc9b30bc4c 100644 --- a/completions/ldapsearch +++ b/completions/ldapsearch @@ -13,7 +13,7 @@ _ldap_protocols() _ldapsearch() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*h) @@ -55,7 +55,7 @@ _ldapsearch() _ldapaddmodify() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*h) @@ -85,7 +85,7 @@ _ldapaddmodify() _ldapdelete() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*h) @@ -115,7 +115,7 @@ _ldapdelete() _ldapcompare() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*h) @@ -145,7 +145,7 @@ _ldapcompare() _ldapmodrdn() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*h) @@ -175,7 +175,7 @@ _ldapmodrdn() _ldapwhoami() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*h) @@ -205,7 +205,7 @@ _ldapwhoami() _ldappasswd() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*h) diff --git a/completions/ldapvi b/completions/ldapvi index cb01ac8dd6d..a984b543d8b 100644 --- a/completions/ldapvi +++ b/completions/ldapvi @@ -3,7 +3,7 @@ _ldapvi() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --host | -!(-*)h) diff --git a/completions/lftp b/completions/lftp index 72dedb42886..81ccb507ccf 100644 --- a/completions/lftp +++ b/completions/lftp @@ -3,7 +3,7 @@ _lftp() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -!(-*)f) diff --git a/completions/lftpget b/completions/lftpget index d21622eb5b7..556bcc892ca 100644 --- a/completions/lftpget +++ b/completions/lftpget @@ -3,7 +3,7 @@ _lftpget() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '-c -d -v' -- "$cur")) diff --git a/completions/lilo b/completions/lilo index af8539aa95d..60a47445c4d 100644 --- a/completions/lilo +++ b/completions/lilo @@ -10,7 +10,7 @@ _lilo_labels() _lilo() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -C | -i | -m | -s | -S) diff --git a/completions/links b/completions/links index f5b81ba5280..8f414ad39eb 100644 --- a/completions/links +++ b/completions/links @@ -3,7 +3,7 @@ _links() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return case $prev in -html-t-text-color | -html-t-link-color) diff --git a/completions/lintian b/completions/lintian index 09167d3d683..eada9005834 100644 --- a/completions/lintian +++ b/completions/lintian @@ -74,7 +74,7 @@ _lintian_infos() _lintian() { local cur prev words cword - _init_completion || return + _comp_initialize || return local lint_actions general_opts behaviour_opts configuration_opts @@ -151,7 +151,7 @@ _lintian() _lintian_info() { local cur prev words cword - _init_completion || return + _comp_initialize || return case "$prev" in --help | --profile) diff --git a/completions/lisp b/completions/lisp index 098567bcab3..0904f84d96f 100644 --- a/completions/lisp +++ b/completions/lisp @@ -5,7 +5,7 @@ _lisp() { local cur prev words cword - _init_completion || return + _comp_initialize || return # completing an option (may or may not be separated by a space) if [[ $cur == -* ]]; then diff --git a/completions/list_admins b/completions/list_admins index 2d7a35112ab..236bdd52095 100644 --- a/completions/list_admins +++ b/completions/list_admins @@ -3,7 +3,7 @@ _list_admins() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--all-vhost --all --help' -- "$cur")) diff --git a/completions/list_lists b/completions/list_lists index 0541bef834a..4de5dd81080 100644 --- a/completions/list_lists +++ b/completions/list_lists @@ -10,7 +10,7 @@ _comp_deprecate_func _mailman_lists _comp_xfunc_list_lists_mailman_lists _list_lists() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--advertised --virtual-host-overview --bare diff --git a/completions/list_members b/completions/list_members index a42d11296b8..67b20b5f3d0 100644 --- a/completions/list_members +++ b/completions/list_members @@ -3,7 +3,7 @@ _list_members() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -o | --output) diff --git a/completions/list_owners b/completions/list_owners index 4c014d5bbd3..264b3ee60cd 100644 --- a/completions/list_owners +++ b/completions/list_owners @@ -3,7 +3,7 @@ _list_owners() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--with-listnames --moderators --help' \ diff --git a/completions/locale-gen b/completions/locale-gen index 40682013104..bec5c2baa5c 100644 --- a/completions/locale-gen +++ b/completions/locale-gen @@ -3,7 +3,7 @@ _locale_gen() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | -h) diff --git a/completions/lpq b/completions/lpq index 36729d22f8b..7e1c4a8e611 100644 --- a/completions/lpq +++ b/completions/lpq @@ -3,7 +3,7 @@ _lpq() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -P) diff --git a/completions/lpr b/completions/lpr index 554f0534040..463a714fd65 100644 --- a/completions/lpr +++ b/completions/lpr @@ -3,7 +3,7 @@ _lpr() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -P) diff --git a/completions/lrzip b/completions/lrzip index 7620e242d16..c1d51b6140f 100644 --- a/completions/lrzip +++ b/completions/lrzip @@ -3,7 +3,7 @@ _lrzip() { local cur prev words cword - _init_completion || return + _comp_initialize || return local xspec="*.lrz" diff --git a/completions/lsof b/completions/lsof index eb1e967da68..e8ff5a92db0 100644 --- a/completions/lsof +++ b/completions/lsof @@ -3,7 +3,7 @@ _lsof() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -'?' | -h | +c | -c | -d | -F | -i | +r | -r | -s | -S | -T) diff --git a/completions/lspci b/completions/lspci index d50783c9948..d153a3d4002 100644 --- a/completions/lspci +++ b/completions/lspci @@ -3,7 +3,7 @@ _lspci() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*[sDO]) diff --git a/completions/lsscsi b/completions/lsscsi index bcbc430a918..5f6d39fa595 100644 --- a/completions/lsscsi +++ b/completions/lsscsi @@ -3,7 +3,7 @@ _lsscsi() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --version | -!(-*)[hV]*) diff --git a/completions/lsusb b/completions/lsusb index 63cff54cd20..4803ed13e95 100644 --- a/completions/lsusb +++ b/completions/lsusb @@ -3,7 +3,7 @@ _lsusb() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version | -!(-*)@([sD]|[hV]*)) diff --git a/completions/lua b/completions/lua index b47a88e6945..f1abad017d9 100644 --- a/completions/lua +++ b/completions/lua @@ -3,7 +3,7 @@ _lua() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -e | -l | -v | -) diff --git a/completions/luac b/completions/luac index 7f47d873ff0..4ad2a210aa7 100644 --- a/completions/luac +++ b/completions/luac @@ -3,7 +3,7 @@ _luac() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -v | -) diff --git a/completions/luseradd b/completions/luseradd index 4d66385bf4a..575a00dec0a 100644 --- a/completions/luseradd +++ b/completions/luseradd @@ -3,7 +3,7 @@ _luseradd() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --usage | --gecos | --uid | --login | --plainpassword | --password | \ diff --git a/completions/luserdel b/completions/luserdel index e36bda9fa19..68c3bf8d460 100644 --- a/completions/luserdel +++ b/completions/luserdel @@ -3,7 +3,7 @@ _luserdel() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --usage | -!(-*)[?]*) diff --git a/completions/lvm b/completions/lvm index e374856b9b6..6c06acc8b2e 100644 --- a/completions/lvm +++ b/completions/lvm @@ -68,7 +68,7 @@ _lvm_count_args() _lvmdiskscan() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -79,7 +79,7 @@ _lvmdiskscan() _pvscan() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -90,7 +90,7 @@ _pvscan() _pvs() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --options | --sort | -!(-*)[oO]) @@ -115,7 +115,7 @@ _pvs() _pvdisplay() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --units) @@ -135,7 +135,7 @@ _pvdisplay() _pvchange() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --autobackup | --allocatable | -!(-*)[Ax]) @@ -155,7 +155,7 @@ _pvchange() _pvcreate() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --restorefile) @@ -187,7 +187,7 @@ _pvcreate() _pvmove() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --autobackup | -!(-*)A) @@ -211,7 +211,7 @@ _pvmove() _pvremove() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -224,7 +224,7 @@ _pvremove() _vgscan() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -235,7 +235,7 @@ _vgscan() _vgs() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --options | --sort | -!(-*)[oO]) @@ -262,7 +262,7 @@ _vgs() _vgdisplay() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --units) @@ -282,7 +282,7 @@ _vgdisplay() _vgchange() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --available | --autobackup | --resizeable | -!(-*)[aAx]) @@ -302,7 +302,7 @@ _vgchange() _vgcreate() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --autobackup | -!(-*)A) @@ -336,7 +336,7 @@ _vgcreate() _vgremove() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -349,7 +349,7 @@ _vgremove() _vgrename() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --autobackup | -!(-*)A) @@ -369,7 +369,7 @@ _vgrename() _vgreduce() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --autobackup | -!(-*)A) @@ -396,7 +396,7 @@ _vgreduce() _vgextend() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --autobackup | -!(-*)A) @@ -426,7 +426,7 @@ _vgextend() _vgport() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -439,7 +439,7 @@ _vgport() _vgck() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -452,7 +452,7 @@ _vgck() _vgconvert() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --metadatatype | -!(-*)M) @@ -480,7 +480,7 @@ _vgconvert() _vgcfgbackup() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --file | -!(-*)f) @@ -500,7 +500,7 @@ _vgcfgbackup() _vgcfgrestore() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --file | -!(-*)f) @@ -528,7 +528,7 @@ _vgcfgrestore() _vgmerge() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --autobackup | -!(-*)A) @@ -548,7 +548,7 @@ _vgmerge() _vgsplit() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --autobackup | -!(-*)A) @@ -578,7 +578,7 @@ _vgsplit() _vgmknodes() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -591,7 +591,7 @@ _vgmknodes() _lvscan() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -602,7 +602,7 @@ _lvscan() _lvs() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --options | --sort | -!(-*)[oO]) @@ -628,7 +628,7 @@ _lvs() _lvdisplay() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --units) @@ -648,7 +648,7 @@ _lvdisplay() _lvchange() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM]) @@ -672,7 +672,7 @@ _lvchange() _lvcreate() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ]) @@ -710,7 +710,7 @@ _lvcreate() _lvremove() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --autobackup | -!(-*)A) @@ -730,7 +730,7 @@ _lvremove() _lvrename() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --autobackup | -!(-*)A) @@ -750,7 +750,7 @@ _lvrename() _lvreduce() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --autobackup | -!(-*)A) @@ -774,7 +774,7 @@ _lvreduce() _lvresize() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --autobackup | -!(-*)A) @@ -804,7 +804,7 @@ _lvresize() _lvextend() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --autobackup | -!(-*)A) @@ -834,7 +834,7 @@ _lvextend() _lvm() { local cur prev words cword - _init_completion || return + _comp_initialize || return if ((cword == 1)); then COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay diff --git a/completions/lz4 b/completions/lz4 index f297b5d8dd3..51e4ff3a882 100644 --- a/completions/lz4 +++ b/completions/lz4 @@ -3,7 +3,7 @@ _lz4() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -b) diff --git a/completions/lzip b/completions/lzip index 05f169c960a..42bfb310dc2 100644 --- a/completions/lzip +++ b/completions/lzip @@ -3,7 +3,7 @@ _lzip() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local decompress=false diff --git a/completions/lzma b/completions/lzma index 34fba89f8a1..dc100144707 100644 --- a/completions/lzma +++ b/completions/lzma @@ -4,7 +4,7 @@ _lzma() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return $split && return diff --git a/completions/lzop b/completions/lzop index 2642742a529..6debaa83b89 100644 --- a/completions/lzop +++ b/completions/lzop @@ -3,7 +3,7 @@ _lzop() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --output | -!(-*)o) diff --git a/completions/macof b/completions/macof index ad29f58fb2d..0cfdb25bf84 100644 --- a/completions/macof +++ b/completions/macof @@ -3,7 +3,7 @@ _macof() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -i) diff --git a/completions/mailmanctl b/completions/mailmanctl index 3bbc2f24172..5d96b3c60c2 100644 --- a/completions/mailmanctl +++ b/completions/mailmanctl @@ -3,7 +3,7 @@ _mailmanctl() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--no-restart --run-as-user diff --git a/completions/make b/completions/make index 9cf841a0774..c7fcb0c1a67 100644 --- a/completions/make +++ b/completions/make @@ -90,7 +90,7 @@ EOF _make() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local makef makef_dir=("-C" ".") i diff --git a/completions/makepkg b/completions/makepkg index 23ac7848620..622d77a03de 100644 --- a/completions/makepkg +++ b/completions/makepkg @@ -4,7 +4,7 @@ _makepkg_slackware() { local cur prev words cword - _init_completion || return + _comp_initialize || return case "$prev" in -l | --linkadd | -c | --chown) diff --git a/completions/man b/completions/man index 74e5e3b87da..732fb1978d2 100644 --- a/completions/man +++ b/completions/man @@ -3,7 +3,7 @@ _man() { local cur prev words cword split - _init_completion -s -n : || return + _comp_initialize -s -n : || return local comprsuffix=".@([glx]z|bz2|lzma|Z|zst)" local manext="@([0-9]*([a-z])|[lnp]|man)?($comprsuffix)" diff --git a/completions/mc b/completions/mc index cf38821c1f3..b7c3615fd02 100644 --- a/completions/mc +++ b/completions/mc @@ -3,7 +3,7 @@ _mc() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --edit | --view | --ftplog | --printwd | -!(-*)[evlP]) diff --git a/completions/mcrypt b/completions/mcrypt index 0c3ab5e681c..e65b8667ae0 100644 --- a/completions/mcrypt +++ b/completions/mcrypt @@ -4,7 +4,7 @@ _mcrypt() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -g | --openpgp-z) diff --git a/completions/mdadm b/completions/mdadm index 37effd96fa6..9e231f6e5f3 100644 --- a/completions/mdadm +++ b/completions/mdadm @@ -70,7 +70,7 @@ _mdadm_update_flag() _mdadm() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --config | --bitmap | --backup-file | -!(-*)[cb]) diff --git a/completions/mdtool b/completions/mdtool index 428e33b7745..e0eed7d88f4 100644 --- a/completions/mdtool +++ b/completions/mdtool @@ -3,7 +3,7 @@ _mdtool() { local cur prev words cword - _init_completion || return + _comp_initialize || return local command i diff --git a/completions/medusa b/completions/medusa index 45129879f60..8781bf7141a 100644 --- a/completions/medusa +++ b/completions/medusa @@ -3,7 +3,7 @@ _medusa() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*h) diff --git a/completions/mii-diag b/completions/mii-diag index c433a7a2493..460e68bd33c 100644 --- a/completions/mii-diag +++ b/completions/mii-diag @@ -3,7 +3,7 @@ _mii_diag() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -F | -A | --advertise | --fixed-speed) diff --git a/completions/mii-tool b/completions/mii-tool index 1b80202b88e..222474245dc 100644 --- a/completions/mii-tool +++ b/completions/mii-tool @@ -3,7 +3,7 @@ _mii_tool() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --force | -!(-*)F) diff --git a/completions/minicom b/completions/minicom index 5f41dc415a5..7f61ceec308 100644 --- a/completions/minicom +++ b/completions/minicom @@ -3,7 +3,7 @@ _minicom() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --attrib | --color | -!(-*)[ac]) diff --git a/completions/mkinitrd b/completions/mkinitrd index bcb7e075173..b018ad6864e 100644 --- a/completions/mkinitrd +++ b/completions/mkinitrd @@ -3,7 +3,7 @@ _mkinitrd() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --preload | --with | --builtin) diff --git a/completions/mktemp b/completions/mktemp index e063810da83..075fc23011e 100644 --- a/completions/mktemp +++ b/completions/mktemp @@ -3,7 +3,7 @@ _mktemp() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case "$prev" in --help | --version | --suffix) diff --git a/completions/mmsitepass b/completions/mmsitepass index 49daae619c1..0f738cd1979 100644 --- a/completions/mmsitepass +++ b/completions/mmsitepass @@ -3,7 +3,7 @@ _mmsitepass() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--listcreator --help' -- "$cur")) diff --git a/completions/modinfo b/completions/modinfo index 4d4d835c4ab..0111ab79121 100644 --- a/completions/modinfo +++ b/completions/modinfo @@ -3,7 +3,7 @@ _modinfo() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case "$prev" in --field | -!(-*)F) diff --git a/completions/modprobe b/completions/modprobe index a4fa5f35cb6..bb74fcf6e60 100644 --- a/completions/modprobe +++ b/completions/modprobe @@ -3,7 +3,7 @@ _modprobe() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case "$prev" in --help | --version | -!(-*)[hV]) diff --git a/completions/monodevelop b/completions/monodevelop index 1c5b5ba4263..d75a81779bf 100644 --- a/completions/monodevelop +++ b/completions/monodevelop @@ -3,7 +3,7 @@ _monodevelop() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return $split && return diff --git a/completions/mplayer b/completions/mplayer index 35ae995327c..1042beebe4a 100644 --- a/completions/mplayer +++ b/completions/mplayer @@ -11,7 +11,7 @@ _mplayer_options_list() _mplayer() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return local cmd=${words[0]} i j k=0 diff --git a/completions/mr b/completions/mr index 5e4c735635b..ece757f4f34 100644 --- a/completions/mr +++ b/completions/mr @@ -3,7 +3,7 @@ _mr() { local cur prev words cword - _init_completion || return + _comp_initialize || return local help commands options diff --git a/completions/msynctool b/completions/msynctool index 4de37f5b099..190d50c8735 100644 --- a/completions/msynctool +++ b/completions/msynctool @@ -3,7 +3,7 @@ _msynctool() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $words in --configure) diff --git a/completions/mtx b/completions/mtx index b5c270bd9f5..1a78714ed79 100644 --- a/completions/mtx +++ b/completions/mtx @@ -4,7 +4,7 @@ _mtx() { local cur prev words cword - _init_completion || return + _comp_initialize || return local options tapes drives diff --git a/completions/munin-node-configure b/completions/munin-node-configure index 39d8d64bf39..432a82f5585 100644 --- a/completions/munin-node-configure +++ b/completions/munin-node-configure @@ -3,7 +3,7 @@ _munin_node_configure() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --config) diff --git a/completions/munin-run b/completions/munin-run index 97e526aae12..f570bc3b10e 100644 --- a/completions/munin-run +++ b/completions/munin-run @@ -3,7 +3,7 @@ _munin_run() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --config | --sconffile) diff --git a/completions/munin-update b/completions/munin-update index 8766eaee2eb..5643470c4f1 100644 --- a/completions/munin-update +++ b/completions/munin-update @@ -3,7 +3,7 @@ _munin_update() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --config) diff --git a/completions/munindoc b/completions/munindoc index 5c7644a6918..63ce23ca7a3 100644 --- a/completions/munindoc +++ b/completions/munindoc @@ -3,7 +3,7 @@ _munindoc() { local cur prev words cword - _init_completion || return + _comp_initialize || return COMPREPLY=($(compgen -W \ '$(command ls /usr/share/munin/plugins 2>/dev/null)' -- "$cur")) diff --git a/completions/mussh b/completions/mussh index f2509bb3ff6..175b1832de4 100644 --- a/completions/mussh +++ b/completions/mussh @@ -3,7 +3,7 @@ _mussh() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | -V | -m | -t) diff --git a/completions/mutt b/completions/mutt index 0af7af0db99..70263830de9 100644 --- a/completions/mutt +++ b/completions/mutt @@ -152,7 +152,7 @@ _muttfiledir() _mutt() { local cur prev words cword - _init_completion -n =+! || return + _comp_initialize -n =+! || return case $cur in -*) diff --git a/completions/mypy b/completions/mypy index 8cba2787742..4ef8a51e0de 100644 --- a/completions/mypy +++ b/completions/mypy @@ -3,7 +3,7 @@ _mypy() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return [[ $cword -gt 2 && ${words[cword - 2]} == --shadow-file ]] && prev=--shadow-file # hack; takes two args diff --git a/completions/mysql b/completions/mysql index 97df733b195..3fe50b05c50 100644 --- a/completions/mysql +++ b/completions/mysql @@ -16,7 +16,7 @@ _comp_deprecate_func _mysql_character_sets _comp_xfunc_mysql_character_sets _mysql() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --user | -!(-*)u) diff --git a/completions/mysqladmin b/completions/mysqladmin index 83297f839ba..875b448141d 100644 --- a/completions/mysqladmin +++ b/completions/mysqladmin @@ -3,7 +3,7 @@ _mysqladmin() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --user | -!(-*)u) diff --git a/completions/nc b/completions/nc index 6fb0994339c..392450d7516 100644 --- a/completions/nc +++ b/completions/nc @@ -3,7 +3,7 @@ _nc() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return case $prev in -*[hIiMmOPpqVWw]) diff --git a/completions/ncftp b/completions/ncftp index c3f2cf15913..6eb0364b301 100644 --- a/completions/ncftp +++ b/completions/ncftp @@ -3,7 +3,7 @@ _ncftp() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -u | -p | -P | -j | -F) diff --git a/completions/nethogs b/completions/nethogs index 5cd3650e4e2..fb6b5eab564 100644 --- a/completions/nethogs +++ b/completions/nethogs @@ -3,7 +3,7 @@ _nethogs() { local cur prev words cword - _init_completion || return + _comp_initialize || return case "$prev" in -d) diff --git a/completions/newlist b/completions/newlist index 0bde9fb1739..8e105ded2fa 100644 --- a/completions/newlist +++ b/completions/newlist @@ -3,7 +3,7 @@ _newlist() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -l | --language | -u | --urlhost | -e | --emailhost | --help) diff --git a/completions/newusers b/completions/newusers index 890a5fccb35..85c20d57179 100644 --- a/completions/newusers +++ b/completions/newusers @@ -3,7 +3,7 @@ _newusers() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -c | --crypt) diff --git a/completions/ngrep b/completions/ngrep index 7d16c8d643f..05cc89ceaf0 100644 --- a/completions/ngrep +++ b/completions/ngrep @@ -3,7 +3,7 @@ _ngrep() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h | -V | -n | -A | -s | -S | -c | -P) diff --git a/completions/nmap b/completions/nmap index 482148e34ea..b125f027f05 100644 --- a/completions/nmap +++ b/completions/nmap @@ -3,7 +3,7 @@ _nmap() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -iL | -oN | -oX | -oS | -oG | ---excludefile | --resume | --stylesheet) diff --git a/completions/nproc b/completions/nproc index 50273f0735c..d5e5d1fffbb 100644 --- a/completions/nproc +++ b/completions/nproc @@ -3,7 +3,7 @@ _nproc() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --version | --ignore) diff --git a/completions/nslookup b/completions/nslookup index 0f7342eda84..d2875802387 100644 --- a/completions/nslookup +++ b/completions/nslookup @@ -26,7 +26,7 @@ _bind_querytype() _nslookup() { local cur prev words cword - _init_completion -n = || return + _comp_initialize -n = || return case $cur in -class=* | -cl=*) @@ -64,7 +64,7 @@ _nslookup() _host() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -c) diff --git a/completions/nsupdate b/completions/nsupdate index 68df333e359..fcf973f9545 100644 --- a/completions/nsupdate +++ b/completions/nsupdate @@ -3,7 +3,7 @@ _nsupdate() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*[VLprtu]) diff --git a/completions/ntpdate b/completions/ntpdate index c69ad63a0ae..efa659bcf35 100644 --- a/completions/ntpdate +++ b/completions/ntpdate @@ -3,7 +3,7 @@ _ntpdate() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*k) diff --git a/completions/oggdec b/completions/oggdec index 97bde2054e4..fdf1595e895 100644 --- a/completions/oggdec +++ b/completions/oggdec @@ -3,7 +3,7 @@ _oggdec() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --version | -!(-*)[hV]*) diff --git a/completions/openssl b/completions/openssl index 8ec0644aa4b..d1b387d8e04 100644 --- a/completions/openssl +++ b/completions/openssl @@ -38,7 +38,7 @@ _openssl_digests() _openssl() { local cur prev words cword - _init_completion || return + _comp_initialize || return local commands command options formats diff --git a/completions/opera b/completions/opera index f2bc8c30005..e7a714e678a 100644 --- a/completions/opera +++ b/completions/opera @@ -3,7 +3,7 @@ _opera() { local cur prev words cword - _init_completion || return + _comp_initialize || return case "$prev" in ?(-)-widget | ?(-)-urllist | ?(-)-uiparserlog | ?(-)-uiwidgetsparserlog | \ diff --git a/completions/optipng b/completions/optipng index 0f6b40e1108..65ab63aebdb 100644 --- a/completions/optipng +++ b/completions/optipng @@ -3,7 +3,7 @@ _optipng() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -'?' | -h | --help | -f) diff --git a/completions/p4 b/completions/p4 index ed5f20c2587..a3ba69f6937 100644 --- a/completions/p4 +++ b/completions/p4 @@ -4,7 +4,7 @@ _p4() { local cur prev words cword - _init_completion || return + _comp_initialize || return local p4commands p4filetypes diff --git a/completions/pack200 b/completions/pack200 index cb9871b1ca3..ae3cdd1a17d 100644 --- a/completions/pack200 +++ b/completions/pack200 @@ -3,7 +3,7 @@ _pack200() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -S | --segment-limit | -P | --pass-file | -C | --class-attribute | \ diff --git a/completions/passwd b/completions/passwd index 6d8bd544520..bd4479d05aa 100644 --- a/completions/passwd +++ b/completions/passwd @@ -3,7 +3,7 @@ _passwd() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --minimum | --maximum | --warning | --inactive | --help | --usage | \ diff --git a/completions/patch b/completions/patch index e883d9cac7e..c0fcdcda9ca 100644 --- a/completions/patch +++ b/completions/patch @@ -3,7 +3,7 @@ _patch() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --strip | --ifdef | --prefix | --basename-prefix | --suffix | --get | \ diff --git a/completions/pdftoppm b/completions/pdftoppm index c9630513b4d..6136269252a 100644 --- a/completions/pdftoppm +++ b/completions/pdftoppm @@ -3,7 +3,7 @@ _comp_cmd_pdftoppm() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -[flrxyWH] | -r[xy] | -scale?(-to-[xy]) | -jpegopt | -[ou]pw) diff --git a/completions/pdftotext b/completions/pdftotext index 89517408be5..1b9ff850d0f 100644 --- a/completions/pdftotext +++ b/completions/pdftotext @@ -3,7 +3,7 @@ _pdftotext() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h | -help | --help | -'?' | -f | -l | -r | -x | -y | -W | -H | \ diff --git a/completions/perl b/completions/perl index cf2b5b304f4..1c72cc120a6 100644 --- a/completions/perl +++ b/completions/perl @@ -11,7 +11,7 @@ _perl_helper() _perl() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return local prefix="" temp optPrefix optSuffix @@ -95,7 +95,7 @@ _perl() _perldoc() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return local prefix="" temp diff --git a/completions/perlcritic b/completions/perlcritic index 7843549516a..3d38c17586a 100644 --- a/completions/perlcritic +++ b/completions/perlcritic @@ -3,7 +3,7 @@ _perlcritic() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version | --top | --include | --exclude | --single-policy | \ diff --git a/completions/perltidy b/completions/perltidy index a6ee36b742f..95aa49047ce 100644 --- a/completions/perltidy +++ b/completions/perltidy @@ -3,7 +3,7 @@ _perltidy() { local cur prev words cword - _init_completion -n = || return + _comp_initialize -n = || return case $prev in -h | --help) diff --git a/completions/pgrep b/completions/pgrep index fa886362e98..d4c01ed39c4 100644 --- a/completions/pgrep +++ b/completions/pgrep @@ -3,7 +3,7 @@ _pgrep() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --delimiter | --pgroup | --session | --terminal | -!(-*)[cdgJMNstTz]) diff --git a/completions/pidof b/completions/pidof index a11b432315e..23de88e3848 100644 --- a/completions/pidof +++ b/completions/pidof @@ -3,7 +3,7 @@ _pidof() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | -V | --version | -!(-*)[hV]*) diff --git a/completions/pine b/completions/pine index 943563c2a4b..abf57ad1186 100644 --- a/completions/pine +++ b/completions/pine @@ -3,7 +3,7 @@ _pine() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -help | -d | -f | -c | -I | -n | -url | -copy_pinerc | -copy_abook) diff --git a/completions/ping b/completions/ping index 418dac10d39..e83ffe62d71 100644 --- a/completions/ping +++ b/completions/ping @@ -3,7 +3,7 @@ _ping() { local cur prev words cword - _init_completion -n = || return + _comp_initialize -n = || return local ipvx diff --git a/completions/pkg-config b/completions/pkg-config index c9c689bb948..c3a7305133a 100644 --- a/completions/pkg-config +++ b/completions/pkg-config @@ -3,7 +3,7 @@ _pkg_config() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --define-variable | --atleast-version | --atleast-pkgconfig-version | \ diff --git a/completions/pkg_delete b/completions/pkg_delete index 2abb6714b1d..4f917178ded 100644 --- a/completions/pkg_delete +++ b/completions/pkg_delete @@ -3,7 +3,7 @@ _pkg_delete() { local cur prev words cword - _init_completion || return + _comp_initialize || return local pkgdir=${PKG_DBDIR:-/var/db/pkg}/ diff --git a/completions/pkgadd b/completions/pkgadd index 4638f57287e..80b1470dc48 100644 --- a/completions/pkgadd +++ b/completions/pkgadd @@ -5,7 +5,7 @@ _pkgadd() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return # if a device directory was given # we must complete with the package diff --git a/completions/pkgrm b/completions/pkgrm index 2449d3497f1..61dde2ff6e5 100644 --- a/completions/pkgrm +++ b/completions/pkgrm @@ -5,7 +5,7 @@ _pkgrm() { local cur prev words cword - _init_completion || return + _comp_initialize || return # if a spool directory was given # we must complete with the package diff --git a/completions/pkgtool b/completions/pkgtool index 951bae40b87..16c89a52184 100644 --- a/completions/pkgtool +++ b/completions/pkgtool @@ -3,7 +3,7 @@ _pkgtool() { local cur prev words cword - _init_completion || return + _comp_initialize || return case "$prev" in --source_dir | --target_dir) diff --git a/completions/pkgutil b/completions/pkgutil index eff989547c0..1566835ad04 100644 --- a/completions/pkgutil +++ b/completions/pkgutil @@ -15,7 +15,7 @@ _pkgutil_url2catalog() _pkgutil() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return local command catalog_files configuration_files declare -a configuration_files=( diff --git a/completions/plague-client b/completions/plague-client index 4e9820631d0..a19997818b4 100644 --- a/completions/plague-client +++ b/completions/plague-client @@ -3,7 +3,7 @@ _plague_client() { local cur prev words cword - _init_completion || return + _comp_initialize || return ((cword == 1)) && COMPREPLY=($(compgen -W 'build detail finish help is_paused kill list diff --git a/completions/pm-hibernate b/completions/pm-hibernate index ea3b0aa744a..6393c88c5f2 100644 --- a/completions/pm-hibernate +++ b/completions/pm-hibernate @@ -3,7 +3,7 @@ _pm_action() { local cur prev words cword - _init_completion || return + _comp_initialize || return COMPREPLY=($(compgen -W "--help $(_parse_help "$1")" -- "$cur")) } && diff --git a/completions/pm-is-supported b/completions/pm-is-supported index adc7fde757c..e2e0e1ee5fb 100644 --- a/completions/pm-is-supported +++ b/completions/pm-is-supported @@ -3,7 +3,7 @@ _pm_is_supported() { local cur prev words cword - _init_completion || return + _comp_initialize || return COMPREPLY=($(compgen -W '--help --suspend --hibernate --suspend-hybrid' \ -- "$cur")) diff --git a/completions/pm-powersave b/completions/pm-powersave index affb195d8fe..aa50c834238 100644 --- a/completions/pm-powersave +++ b/completions/pm-powersave @@ -3,7 +3,7 @@ _pm_powersave() { local cur prev words cword - _init_completion || return + _comp_initialize || return COMPREPLY=($(compgen -W "true false" -- "$cur")) } && diff --git a/completions/pngfix b/completions/pngfix index 64b5481ddb4..3fe9615b3c5 100644 --- a/completions/pngfix +++ b/completions/pngfix @@ -3,7 +3,7 @@ _pngfix() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --suffix | --prefix) diff --git a/completions/portinstall b/completions/portinstall index 803374071b5..82f57f531e8 100644 --- a/completions/portinstall +++ b/completions/portinstall @@ -3,7 +3,7 @@ _portinstall() { local cur prev words cword - _init_completion || return + _comp_initialize || return local portsdir indexfile local -a COMPREPLY2 diff --git a/completions/portsnap b/completions/portsnap index a2f0a936a44..9dff283bbb2 100644 --- a/completions/portsnap +++ b/completions/portsnap @@ -5,7 +5,7 @@ _portsnap() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -d | -p) diff --git a/completions/portupgrade b/completions/portupgrade index ffe63056ad8..476e18142c1 100644 --- a/completions/portupgrade +++ b/completions/portupgrade @@ -3,7 +3,7 @@ _portupgrade() { local cur prev words cword - _init_completion || return + _comp_initialize || return [[ $prev == -l || $prev == -L || $prev == -o ]] && return diff --git a/completions/postcat b/completions/postcat index a58b0e5781d..46cdc719a4e 100644 --- a/completions/postcat +++ b/completions/postcat @@ -3,7 +3,7 @@ _postcat() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -c) diff --git a/completions/postconf b/completions/postconf index 4cb324c125d..c2e8d59b5b1 100644 --- a/completions/postconf +++ b/completions/postconf @@ -3,7 +3,7 @@ _postconf() { local cur prev words cword - _init_completion || return + _comp_initialize || return local eqext diff --git a/completions/postfix b/completions/postfix index f96055027fa..cb4293b15ec 100644 --- a/completions/postfix +++ b/completions/postfix @@ -3,7 +3,7 @@ _postfix() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -c) diff --git a/completions/postmap b/completions/postmap index 35c4ada15c6..0c2fd9d73fc 100644 --- a/completions/postmap +++ b/completions/postmap @@ -3,7 +3,7 @@ _postmap() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -c) diff --git a/completions/postsuper b/completions/postsuper index 19b265f95c1..464a91e28a7 100644 --- a/completions/postsuper +++ b/completions/postsuper @@ -3,7 +3,7 @@ _postsuper() { local cur prev words cword - _init_completion || return + _comp_initialize || return local pval len diff --git a/completions/povray b/completions/povray index 1910d7f0849..d2915f7d0b5 100644 --- a/completions/povray +++ b/completions/povray @@ -4,7 +4,7 @@ _povray() { local cur prev words cword - _init_completion || return + _comp_initialize || return local povcur=$cur pfx oext defoext defoext=png # default output extension, if cannot be determined FIXME diff --git a/completions/prelink b/completions/prelink index 1c39611f630..50b3d297d2c 100644 --- a/completions/prelink +++ b/completions/prelink @@ -3,7 +3,7 @@ _prelink() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -'?' | --help | --usage | -V | --version | -r | --reloc-only) diff --git a/completions/printenv b/completions/printenv index 3553e83db5c..8099529131e 100644 --- a/completions/printenv +++ b/completions/printenv @@ -3,7 +3,7 @@ _printenv() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version) diff --git a/completions/protoc b/completions/protoc index 10294f5cf9a..f4ff0786f19 100644 --- a/completions/protoc +++ b/completions/protoc @@ -3,7 +3,7 @@ _protoc() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --version | -h | --help | --encode | --decode) diff --git a/completions/ps b/completions/ps index 8c8b5833074..d02ee337882 100644 --- a/completions/ps +++ b/completions/ps @@ -3,7 +3,7 @@ _comp_cmd_ps() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help) diff --git a/completions/psql b/completions/psql index e019d596b1c..61d57b9a4e7 100644 --- a/completions/psql +++ b/completions/psql @@ -21,7 +21,7 @@ _pg_users() _createdb() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --host | -!(-*)h) @@ -54,7 +54,7 @@ _createdb() _createuser() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --version | --port | --connection-limit | -!(-*)[pc]) @@ -84,7 +84,7 @@ _createuser() _dropdb() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --host | -!(-*)h) @@ -116,7 +116,7 @@ _dropdb() _dropuser() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --version | --port | -!(-*)p) @@ -148,7 +148,7 @@ _dropuser() _psql() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --host | -!(-*)h) diff --git a/completions/puppet b/completions/puppet index 6e98f89cf2f..5c67c0db4d7 100644 --- a/completions/puppet +++ b/completions/puppet @@ -63,7 +63,7 @@ _puppet_subcmd_opts() _puppet() { local cur prev words cword - _init_completion || return + _comp_initialize || return local subcommand action diff --git a/completions/pv b/completions/pv index bc10055a5c3..713f55bcfeb 100644 --- a/completions/pv +++ b/completions/pv @@ -3,7 +3,7 @@ _pv() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version | --last-written | --format | --delay-start | \ diff --git a/completions/pwck b/completions/pwck index 533a254a453..6fec79e437e 100644 --- a/completions/pwck +++ b/completions/pwck @@ -3,7 +3,7 @@ _pwck() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($( diff --git a/completions/pwd b/completions/pwd index be2d94ade42..1f8492ede84 100644 --- a/completions/pwd +++ b/completions/pwd @@ -3,7 +3,7 @@ _pwd() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version) diff --git a/completions/pwdx b/completions/pwdx index 25a1a1e118a..ce99ae3aaf1 100644 --- a/completions/pwdx +++ b/completions/pwdx @@ -3,7 +3,7 @@ _pwdx() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h | --help | -V | --version) diff --git a/completions/pwgen b/completions/pwgen index 50d31d5f400..a2107d50f60 100644 --- a/completions/pwgen +++ b/completions/pwgen @@ -3,7 +3,7 @@ _pwgen() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --num-passwords | --help | -!(-*)[Nh]) diff --git a/completions/pycodestyle b/completions/pycodestyle index dec6f375993..aa686a842d9 100644 --- a/completions/pycodestyle +++ b/completions/pycodestyle @@ -3,7 +3,7 @@ _pycodestyle() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -h | --help | --version) diff --git a/completions/pydoc b/completions/pydoc index 5295cde9bb5..d3235a4e676 100644 --- a/completions/pydoc +++ b/completions/pydoc @@ -3,7 +3,7 @@ _pydoc() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -k | -p) diff --git a/completions/pydocstyle b/completions/pydocstyle index 538e722725b..81a7e9fcf05 100644 --- a/completions/pydocstyle +++ b/completions/pydocstyle @@ -3,7 +3,7 @@ _pydocstyle() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --version | --match | --ignore-decorators | --select | \ diff --git a/completions/pyflakes b/completions/pyflakes index 0a4e977197a..58ad3a6e90e 100644 --- a/completions/pyflakes +++ b/completions/pyflakes @@ -3,7 +3,7 @@ _pyflakes() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h | --help | --version) diff --git a/completions/pylint b/completions/pylint index 6b3b39e1a66..87aa575a6a1 100644 --- a/completions/pylint +++ b/completions/pylint @@ -22,7 +22,7 @@ _comp_cmd_pylint_message_ids() _pylint() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local python=python [[ ${1##*/} == *3* ]] && python=python3 diff --git a/completions/pytest b/completions/pytest index 762203596b0..7d9255e78c1 100644 --- a/completions/pytest +++ b/completions/pytest @@ -11,7 +11,7 @@ _pytest_option_choice_args() _pytest() { local cur prev words cword split - _init_completion -s -n : || return + _comp_initialize -s -n : || return case $prev in --help | --maxfail | --report | --junit-prefix | --doctest-glob | \ diff --git a/completions/python b/completions/python index 9ac9c59250c..16d4fa59387 100644 --- a/completions/python +++ b/completions/python @@ -19,7 +19,7 @@ _comp_deprecate_func _python_warning_actions _comp_xfunc_python_warning_actions _python() { local cur prev words cword prefix - _init_completion || return + _comp_initialize || return case $cur in -[QWX]?*) diff --git a/completions/pyvenv b/completions/pyvenv index c8312497f94..4413a814605 100644 --- a/completions/pyvenv +++ b/completions/pyvenv @@ -3,7 +3,7 @@ _pyvenv() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -h | --help) diff --git a/completions/qdbus b/completions/qdbus index 4efb78c2f77..55eac734007 100644 --- a/completions/qdbus +++ b/completions/qdbus @@ -3,7 +3,7 @@ _qdbus() { local cur prev words cword - _init_completion || return + _comp_initialize || return [[ $cur ]] && unset -v "words[$((${#words[@]} - 1))]" COMPREPLY=($(compgen -W '$(command ${words[@]} 2>/dev/null | \ diff --git a/completions/qemu b/completions/qemu index 8d83d4f97ac..05c411f7c13 100644 --- a/completions/qemu +++ b/completions/qemu @@ -3,7 +3,7 @@ _qemu() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -fd[ab] | -hd[abcd] | -cdrom | -option-rom | -kernel | -initrd | \ diff --git a/completions/qrunner b/completions/qrunner index 3919ea25b2f..f904c9f78db 100644 --- a/completions/qrunner +++ b/completions/qrunner @@ -3,7 +3,7 @@ _qrunner() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return $split && return diff --git a/completions/querybts b/completions/querybts index 087bfe8c6a5..667c56550bb 100644 --- a/completions/querybts +++ b/completions/querybts @@ -3,7 +3,7 @@ _querybts() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --bts | -!(-*)B) diff --git a/completions/quota b/completions/quota index 31aebfcbed9..7079b601a99 100644 --- a/completions/quota +++ b/completions/quota @@ -40,7 +40,7 @@ _filesystems() _quota() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -F | --format) @@ -65,7 +65,7 @@ _quota() _setquota() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -F | --format) @@ -105,7 +105,7 @@ _setquota() _edquota() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -F | --format) @@ -138,7 +138,7 @@ _edquota() _quotacheck() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -F | --format) @@ -163,7 +163,7 @@ _quotacheck() _quotaon() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -F | --format) diff --git a/completions/radvdump b/completions/radvdump index 850628fdaa9..9d9afa3b5c5 100644 --- a/completions/radvdump +++ b/completions/radvdump @@ -3,7 +3,7 @@ _radvdump() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h | --help | -v | --version) diff --git a/completions/rcs b/completions/rcs index c04d89d2de0..07cd18a41a4 100644 --- a/completions/rcs +++ b/completions/rcs @@ -3,7 +3,7 @@ _rcs() { local cur prev words cword - _init_completion || return + _comp_initialize || return local file dir i diff --git a/completions/rdesktop b/completions/rdesktop index 4a44737ffde..2b38123f393 100644 --- a/completions/rdesktop +++ b/completions/rdesktop @@ -3,7 +3,7 @@ _rdesktop() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return case $prev in -*k) diff --git a/completions/remove_members b/completions/remove_members index e6bde8319fb..d53cebf19fd 100644 --- a/completions/remove_members +++ b/completions/remove_members @@ -3,7 +3,7 @@ _remove_members() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -f | --file) diff --git a/completions/removepkg b/completions/removepkg index 392ff899e29..77883494af2 100644 --- a/completions/removepkg +++ b/completions/removepkg @@ -3,7 +3,7 @@ _removepkg() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '-copy -keep -preserve -warn' -- "$cur")) return diff --git a/completions/reportbug b/completions/reportbug index 15eaeb08ad2..77eff93e598 100644 --- a/completions/reportbug +++ b/completions/reportbug @@ -3,7 +3,7 @@ _reportbug() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --class | --header | --pseudo-header | --mirror | --list-cc | \ diff --git a/completions/resolvconf b/completions/resolvconf index b407488c986..5e262ee4b6a 100644 --- a/completions/resolvconf +++ b/completions/resolvconf @@ -3,7 +3,7 @@ _resolvconf() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -a | -d) diff --git a/completions/ri b/completions/ri index 69a62d29d83..927841ed45f 100644 --- a/completions/ri +++ b/completions/ri @@ -36,7 +36,7 @@ _ri_get_methods() _ri() { local cur prev words cword split - _init_completion -s -n : || return + _comp_initialize -s -n : || return case $prev in --help | --width | -!(-*)[hw]) diff --git a/completions/rmlist b/completions/rmlist index d8e710b950b..4443ee577c4 100644 --- a/completions/rmlist +++ b/completions/rmlist @@ -3,7 +3,7 @@ _rmlist() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--archives --help' -- "$cur")) diff --git a/completions/rmmod b/completions/rmmod index 7ec29e6cb95..a72d3899924 100644 --- a/completions/rmmod +++ b/completions/rmmod @@ -4,7 +4,7 @@ _rmmod() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h | --help | -V | --version) diff --git a/completions/route b/completions/route index 9551a6489d9..ae7c1bddf0d 100644 --- a/completions/route +++ b/completions/route @@ -5,7 +5,7 @@ _route() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $prev == dev ]]; then _available_interfaces diff --git a/completions/rpcdebug b/completions/rpcdebug index ccbde72e0ef..906ab665b59 100644 --- a/completions/rpcdebug +++ b/completions/rpcdebug @@ -20,7 +20,7 @@ _rpcdebug_flags() _rpcdebug() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*s) diff --git a/completions/rpm b/completions/rpm index 0142d82a98f..d874ff24767 100644 --- a/completions/rpm +++ b/completions/rpm @@ -48,7 +48,7 @@ _rpm_buildarchs() _rpm() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return if ((cword == 1)); then # first parameter on line @@ -240,7 +240,7 @@ _rpm() _rpmbuild() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local rpm="${1%build*}" [[ $rpm == "$1" ]] || ! type $rpm &>/dev/null && rpm= diff --git a/completions/rpm2tgz b/completions/rpm2tgz index 5ddcfd59388..4563b8d41b1 100644 --- a/completions/rpm2tgz +++ b/completions/rpm2tgz @@ -3,7 +3,7 @@ _rpm2tgz() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '-s -S -n -r -d -c' -- "$cur")) diff --git a/completions/rpmcheck b/completions/rpmcheck index cf4ed958798..21f45d7bb97 100644 --- a/completions/rpmcheck +++ b/completions/rpmcheck @@ -3,7 +3,7 @@ _rpmcheck() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -base) diff --git a/completions/rrdtool b/completions/rrdtool index dcb9ce67ac9..eeff61a566e 100644 --- a/completions/rrdtool +++ b/completions/rrdtool @@ -3,7 +3,7 @@ _rrdtool() { local cur prev words cword - _init_completion || return + _comp_initialize || return if ((${#words[@]} == 2)); then COMPREPLY=($(compgen -W 'create update updatev graph dump restore diff --git a/completions/rsync b/completions/rsync index fec65b8acb1..31df388dca8 100644 --- a/completions/rsync +++ b/completions/rsync @@ -3,7 +3,7 @@ _rsync() { local cur prev words cword split - _init_completion -s -n : || return + _comp_initialize -s -n : || return case $prev in --config | --password-file | --include-from | --exclude-from | \ diff --git a/completions/sbcl b/completions/sbcl index 22a93e4ad66..2872b4250ef 100644 --- a/completions/sbcl +++ b/completions/sbcl @@ -5,7 +5,7 @@ _sbcl() { local cur prev words cword - _init_completion || return + _comp_initialize || return # completing an option (may or may not be separated by a space) if [[ $cur == -* ]]; then diff --git a/completions/sbopkg b/completions/sbopkg index 35423b303be..b0d7978433b 100644 --- a/completions/sbopkg +++ b/completions/sbopkg @@ -3,7 +3,7 @@ _sbopkg() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur")) diff --git a/completions/screen b/completions/screen index e58f36edc49..1f4783c897a 100644 --- a/completions/screen +++ b/completions/screen @@ -24,7 +24,7 @@ _screen_sessions() _screen() { local cur prev words cword - _init_completion || return + _comp_initialize || return if ((cword == 1)); then if [[ $cur == /dev* ]]; then diff --git a/completions/scrub b/completions/scrub index 838edcb8336..15c62bf6683 100644 --- a/completions/scrub +++ b/completions/scrub @@ -3,7 +3,7 @@ _scrub() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --version | --help | --blocksize | --device-size | --dirent | \ diff --git a/completions/secret-tool b/completions/secret-tool index 0722aa0299f..bcf881e41d2 100644 --- a/completions/secret-tool +++ b/completions/secret-tool @@ -3,7 +3,7 @@ _secret_tool() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return $split && return diff --git a/completions/sh b/completions/sh index 5624ffa3d7d..b611d19a105 100644 --- a/completions/sh +++ b/completions/sh @@ -3,7 +3,7 @@ _sh() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -c) diff --git a/completions/sha256sum b/completions/sha256sum index 63fb16b6817..6dc8f617c1f 100644 --- a/completions/sha256sum +++ b/completions/sha256sum @@ -3,7 +3,7 @@ _comp_cmd_sha256sum() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -h | --help | --version) diff --git a/completions/shellcheck b/completions/shellcheck index 6421d7b6e33..fda5d74b2b8 100644 --- a/completions/shellcheck +++ b/completions/shellcheck @@ -10,7 +10,7 @@ _shellcheck_optarg() _shellcheck() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --version | -!(-*)V*) diff --git a/completions/sitecopy b/completions/sitecopy index 85156875bf0..0f143aec3d1 100644 --- a/completions/sitecopy +++ b/completions/sitecopy @@ -6,7 +6,7 @@ _sitecopy() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --debug | -!(-*)d) diff --git a/completions/slapt-get b/completions/slapt-get index 5d6375d59be..3454a2da8d9 100644 --- a/completions/slapt-get +++ b/completions/slapt-get @@ -3,7 +3,7 @@ _slapt_get() { local cur prev words cword - _init_completion || return + _comp_initialize || return case "$prev" in --config | -c) diff --git a/completions/slapt-src b/completions/slapt-src index c6efb5c123b..ae55906f3f0 100644 --- a/completions/slapt-src +++ b/completions/slapt-src @@ -3,7 +3,7 @@ _slapt_src() { local cur prev words cword split - _init_completion -s -n : || return + _comp_initialize -s -n : || return case "$prev" in --config | -c) diff --git a/completions/smartctl b/completions/smartctl index aa85266d730..3fcda6cf168 100644 --- a/completions/smartctl +++ b/completions/smartctl @@ -94,7 +94,7 @@ _smartctl_drivedb() _smartctl() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --quietmode | -!(-*)q) diff --git a/completions/smbclient b/completions/smbclient index 4331797cf63..9919c4d1aea 100644 --- a/completions/smbclient +++ b/completions/smbclient @@ -42,7 +42,7 @@ _samba_signing() _smbclient() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --name-resolve | -!(-*)R) @@ -108,7 +108,7 @@ _smbclient() _smbget() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --outputfile | --rcfile | -!(-*)[of]) @@ -140,7 +140,7 @@ _smbget() _smbcacls() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --configfile | --authentication-file | -!(-*)[As]) @@ -185,7 +185,7 @@ _smbcacls() _smbcquotas() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --configfile | --authentication-file | -!(-*)[sA]) @@ -221,7 +221,7 @@ _smbcquotas() _smbpasswd() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*r) @@ -254,7 +254,7 @@ _smbpasswd() _smbtar() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*[rt]) @@ -287,7 +287,7 @@ _smbtar() _smbtree() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --configfile | --authentication-file | -!(-*)[sA]) diff --git a/completions/snownews b/completions/snownews index 5b585d92486..b61bc2a060d 100644 --- a/completions/snownews +++ b/completions/snownews @@ -3,7 +3,7 @@ _snownews() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then # return list of available options diff --git a/completions/sqlite3 b/completions/sqlite3 index 80cc660e2f9..7c53e57ddc0 100644 --- a/completions/sqlite3 +++ b/completions/sqlite3 @@ -3,7 +3,7 @@ _sqlite3() { local cur prev words cword - _init_completion || return + _comp_initialize || return local dbexts='@(sqlite?(3)|?(s?(3))db)' diff --git a/completions/ss b/completions/ss index c7987182ff4..810c3954d3e 100644 --- a/completions/ss +++ b/completions/ss @@ -3,7 +3,7 @@ _ss() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --version | -!(-*)[hV]) diff --git a/completions/ssh b/completions/ssh index ccf7241ef79..27055bfb7ad 100644 --- a/completions/ssh +++ b/completions/ssh @@ -263,7 +263,7 @@ _comp_deprecate_func _ssh_identityfile _comp_xfunc_ssh_identityfile _ssh() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return local configfile _ssh_configfile @@ -366,7 +366,7 @@ _ssh() _sftp() { local cur prev words cword - _init_completion || return + _comp_initialize || return local configfile _ssh_configfile @@ -505,7 +505,7 @@ _comp_deprecate_func _scp_local_files _comp_xfunc_ssh_scp_local_files _scp() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return local configfile _ssh_configfile diff --git a/completions/ssh-add b/completions/ssh-add index d8f74926458..a7de9372df8 100644 --- a/completions/ssh-add +++ b/completions/ssh-add @@ -3,7 +3,7 @@ _ssh_add() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*E) diff --git a/completions/ssh-copy-id b/completions/ssh-copy-id index 39321571986..b929d88ce1e 100644 --- a/completions/ssh-copy-id +++ b/completions/ssh-copy-id @@ -3,7 +3,7 @@ _ssh_copy_id() { local cur prev words cword - _init_completion || return + _comp_initialize || return _comp_xfunc ssh suboption_check "$1" && return diff --git a/completions/ssh-keygen b/completions/ssh-keygen index 65fcaf95aca..316d0ecdb39 100644 --- a/completions/ssh-keygen +++ b/completions/ssh-keygen @@ -3,7 +3,7 @@ _ssh_keygen() { local cur prev words cword - _init_completion -n := || return + _comp_initialize -n := || return case $prev in -*[aCIJjMNPSVWz]) diff --git a/completions/ssh-keyscan b/completions/ssh-keyscan index ed57234079f..95aacca0ee3 100644 --- a/completions/ssh-keyscan +++ b/completions/ssh-keyscan @@ -3,7 +3,7 @@ _comp_cmd_ssh_keyscan() { local cur prev words cword - _init_completion || return + _comp_initialize || return local ipvx diff --git a/completions/sshfs b/completions/sshfs index 97a17b32247..e03588a4a13 100644 --- a/completions/sshfs +++ b/completions/sshfs @@ -3,7 +3,7 @@ _sshfs() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return _expand || return diff --git a/completions/sshmitm b/completions/sshmitm index ee893e59a54..77695a09bc9 100644 --- a/completions/sshmitm +++ b/completions/sshmitm @@ -3,7 +3,7 @@ _sshmitm() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur")) diff --git a/completions/sshow b/completions/sshow index 917444ea311..d6ca1df787a 100644 --- a/completions/sshow +++ b/completions/sshow @@ -3,7 +3,7 @@ _sshow() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*i) diff --git a/completions/strace b/completions/strace index f0da23e119f..052487aa368 100644 --- a/completions/strace +++ b/completions/strace @@ -3,7 +3,7 @@ _strace() { local cur prev words cword - _init_completion -n = || return + _comp_initialize -n = || return # check if we're still completing strace local offset=0 i diff --git a/completions/strings b/completions/strings index 51abe94d90e..a7629e11126 100644 --- a/completions/strings +++ b/completions/strings @@ -3,7 +3,7 @@ _strings() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --version | --bytes | --output-separator | -arch | \ diff --git a/completions/sudo b/completions/sudo index 43b48ac235b..7bdfc28b411 100644 --- a/completions/sudo +++ b/completions/sudo @@ -3,7 +3,7 @@ _sudo() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local i mode=normal [[ $1 == *sudoedit ]] && mode=edit diff --git a/completions/svcadm b/completions/svcadm index 943f8a17be7..1ecf6843708 100644 --- a/completions/svcadm +++ b/completions/svcadm @@ -100,7 +100,7 @@ _smf_complete_fmri() _svcadm() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return local command_list="enable disable restart refresh clear mark milestone" local command i diff --git a/completions/svk b/completions/svk index 1da5fc12c8c..663726d38c4 100644 --- a/completions/svk +++ b/completions/svk @@ -3,7 +3,7 @@ _svk() { local cur prev words cword - _init_completion || return + _comp_initialize || return local commands options command diff --git a/completions/sync_members b/completions/sync_members index 2be74959978..27830dfb87e 100644 --- a/completions/sync_members +++ b/completions/sync_members @@ -3,7 +3,7 @@ _sync_members() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -w | -g | -d | --welcome-msg | --goodbye-msg | --digest) diff --git a/completions/synclient b/completions/synclient index c4a0d42ff42..fa7b70423b8 100644 --- a/completions/synclient +++ b/completions/synclient @@ -3,7 +3,7 @@ _synclient() { local cur prev words cword - _init_completion -n = || return + _comp_initialize -n = || return case $prev in -\? | -h | -V) diff --git a/completions/sysbench b/completions/sysbench index 0af7cc33b35..1e9c59d7297 100644 --- a/completions/sysbench +++ b/completions/sysbench @@ -3,7 +3,7 @@ _sysbench() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --num-threads | --max-requests | --max-time | --thread-stack-size | \ diff --git a/completions/sysctl b/completions/sysctl index b33356ef769..a3656c1a4e0 100644 --- a/completions/sysctl +++ b/completions/sysctl @@ -3,7 +3,7 @@ _sysctl() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version | --pattern | -!(-*)[hVr]) diff --git a/completions/tar b/completions/tar index ede594590d0..d4bbb5c1e04 100644 --- a/completions/tar +++ b/completions/tar @@ -505,7 +505,7 @@ _gtar() local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return # Fill the {long,short}_{opts,arg*} __gnu_tar_parse_help @@ -687,7 +687,7 @@ _posix_tar() local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return basic_tar=yes tar_mode=none diff --git a/completions/tcpdump b/completions/tcpdump index 9a7c2e9ccce..2ea2d5207ac 100644 --- a/completions/tcpdump +++ b/completions/tcpdump @@ -3,7 +3,7 @@ _tcpdump() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -!(-*)[rwFV]) diff --git a/completions/tcpkill b/completions/tcpkill index 189d928e2cb..9d59fe28f92 100644 --- a/completions/tcpkill +++ b/completions/tcpkill @@ -3,7 +3,7 @@ _tcpkill() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*i) diff --git a/completions/tcpnice b/completions/tcpnice index c6a94d6b568..4a0d086667b 100644 --- a/completions/tcpnice +++ b/completions/tcpnice @@ -3,7 +3,7 @@ _tcpnice() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*i) diff --git a/completions/timeout b/completions/timeout index 2f3731910f9..a55f0804ba5 100644 --- a/completions/timeout +++ b/completions/timeout @@ -3,7 +3,7 @@ _timeout() { local cur prev words cword split i found=false - _init_completion -s || return + _comp_initialize -s || return for ((i = 1; i <= COMP_CWORD; i++)); do if [[ ${COMP_WORDS[i]} != -* && ${COMP_WORDS[i - 1]} != = ]]; then diff --git a/completions/tipc b/completions/tipc index eadfcc2f9c5..31d27a27fdf 100644 --- a/completions/tipc +++ b/completions/tipc @@ -80,7 +80,7 @@ _tipc_link() _tipc() { local cur prev words cword optind i p - _init_completion || return + _comp_initialize || return optind=1 COMPREPLY=() diff --git a/completions/tox b/completions/tox index eab519962b8..9b68f177a43 100644 --- a/completions/tox +++ b/completions/tox @@ -3,7 +3,7 @@ _tox() { local cur prev words cword - _init_completion || return + _comp_initialize || return # Complete defaults following a "--" if [[ "${words[*]:0:cword} " == *\ --\ * && $cur != -- ]]; then diff --git a/completions/tracepath b/completions/tracepath index 3fbdb2a2bc9..6c076b5ade6 100644 --- a/completions/tracepath +++ b/completions/tracepath @@ -3,7 +3,7 @@ _tracepath() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*[lmp]) diff --git a/completions/tree b/completions/tree index d1d14488acf..19d5b81df73 100644 --- a/completions/tree +++ b/completions/tree @@ -3,7 +3,7 @@ _comp_cmd_tree() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -!(-*)[LPIHT] | --filelimit | --timefmt | --help | --version) diff --git a/completions/truncate b/completions/truncate index eff96426f15..28cae4dc7ba 100644 --- a/completions/truncate +++ b/completions/truncate @@ -3,7 +3,7 @@ _comp_cmd_truncate() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -!(-*)s | --size | --help | --version) diff --git a/completions/tshark b/completions/tshark index ac8f7849bb9..ae9e35bfe8f 100644 --- a/completions/tshark +++ b/completions/tshark @@ -3,7 +3,7 @@ _tshark() { local cur prev words cword prefix - _init_completion -n : || return + _comp_initialize -n : || return case $cur in -o*) diff --git a/completions/tsig-keygen b/completions/tsig-keygen index f49de5e882a..adea1b13941 100644 --- a/completions/tsig-keygen +++ b/completions/tsig-keygen @@ -3,7 +3,7 @@ _tsig_keygen() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h) diff --git a/completions/tune2fs b/completions/tune2fs index c2f41722d03..c534f0fbf6e 100644 --- a/completions/tune2fs +++ b/completions/tune2fs @@ -3,7 +3,7 @@ _tune2fs() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*[cCEiJLmrT]) diff --git a/completions/ulimit b/completions/ulimit index 94e0320ee12..3d8c52d364b 100644 --- a/completions/ulimit +++ b/completions/ulimit @@ -3,7 +3,7 @@ _ulimit() { local cur prev words cword - _init_completion || return + _comp_initialize || return # TODO combined option support (-aH, -Sc etc) diff --git a/completions/unace b/completions/unace index ab539af90e3..3a1f09d24b6 100644 --- a/completions/unace +++ b/completions/unace @@ -3,7 +3,7 @@ _unace() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '-c -c- -f -f- -o -o- -p -y -y-' -- "$cur")) diff --git a/completions/unpack200 b/completions/unpack200 index 8814259ba5d..c021dc8a064 100644 --- a/completions/unpack200 +++ b/completions/unpack200 @@ -3,7 +3,7 @@ _unpack200() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --version | -!(-*)[?hVJ]) diff --git a/completions/unrar b/completions/unrar index 01e0728c531..41f5662634d 100644 --- a/completions/unrar +++ b/completions/unrar @@ -3,7 +3,7 @@ _unrar() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '-ad -ap -av- -c- -cfg- -cl -cu -dh -ep -f diff --git a/completions/unshunt b/completions/unshunt index 95a16015b49..6bdb362061d 100644 --- a/completions/unshunt +++ b/completions/unshunt @@ -3,7 +3,7 @@ _unshunt() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur")) diff --git a/completions/update-alternatives b/completions/update-alternatives index 25d2ce6b469..71c849ef032 100644 --- a/completions/update-alternatives +++ b/completions/update-alternatives @@ -19,7 +19,7 @@ _installed_alternatives() _update_alternatives() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --altdir | --admindir) diff --git a/completions/update-rc.d b/completions/update-rc.d index 63062f6d757..57dc910158b 100644 --- a/completions/update-rc.d +++ b/completions/update-rc.d @@ -5,7 +5,7 @@ _update_rc_d() { local cur prev words cword - _init_completion || return + _comp_initialize || return local sysvdir services options diff --git a/completions/upgradepkg b/completions/upgradepkg index d3ce6084c0c..ea33ec58878 100644 --- a/completions/upgradepkg +++ b/completions/upgradepkg @@ -3,7 +3,7 @@ _upgradepkg() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--dry-run --install-new --reinstall diff --git a/completions/urlsnarf b/completions/urlsnarf index e32707622c1..9a481c7a1c1 100644 --- a/completions/urlsnarf +++ b/completions/urlsnarf @@ -3,7 +3,7 @@ _urlsnarf() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*i) diff --git a/completions/uscan b/completions/uscan index d16ded2d331..d26b4e38050 100644 --- a/completions/uscan +++ b/completions/uscan @@ -3,7 +3,7 @@ _uscan() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --package) diff --git a/completions/useradd b/completions/useradd index 31487aa8fa6..49da5a8a3f5 100644 --- a/completions/useradd +++ b/completions/useradd @@ -3,7 +3,7 @@ _useradd() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return # TODO: if -o/--non-unique is given, could complete on existing uids # with -u/--uid diff --git a/completions/userdel b/completions/userdel index ed98447b1d0..13457ea08f3 100644 --- a/completions/userdel +++ b/completions/userdel @@ -3,7 +3,7 @@ _userdel() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | -!(-*)h) diff --git a/completions/usermod b/completions/usermod index 0817f2f2ca8..d36c6afb191 100644 --- a/completions/usermod +++ b/completions/usermod @@ -3,7 +3,7 @@ _usermod() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return # TODO: if -o/--non-unique is given, could complete on existing uids # with -u/--uid diff --git a/completions/valgrind b/completions/valgrind index d6d54fe1f6c..0370986d890 100644 --- a/completions/valgrind +++ b/completions/valgrind @@ -3,7 +3,7 @@ _valgrind() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local i # Note: intentionally using COMP_WORDS and COMP_CWORD instead of diff --git a/completions/vipw b/completions/vipw index 809b737f247..2f7828ab0db 100644 --- a/completions/vipw +++ b/completions/vipw @@ -3,7 +3,7 @@ _vipw() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | -!(-*)h) diff --git a/completions/vmstat b/completions/vmstat index e36934a55d5..f487b4a1b48 100644 --- a/completions/vmstat +++ b/completions/vmstat @@ -3,7 +3,7 @@ _vmstat() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version | --partition | -!(-*)[hVcMNnwp]) diff --git a/completions/vncviewer b/completions/vncviewer index ba5522689e8..364fe9a5c19 100644 --- a/completions/vncviewer +++ b/completions/vncviewer @@ -19,7 +19,7 @@ _vncviewer_bootstrap() _tightvncviewer() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -passwd) @@ -53,7 +53,7 @@ _tightvncviewer() _xvnc4viewer() { local cur prev words cword - _init_completion || return + _comp_initialize || return # Both single dash (-) and double dash (--) are allowed as option prefix local opt=${prev/#--/-} diff --git a/completions/vpnc b/completions/vpnc index f5f740b558a..d0a14df6bef 100644 --- a/completions/vpnc +++ b/completions/vpnc @@ -3,7 +3,7 @@ _vpnc() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --long-help | --version | --id | --username | --domain | \ diff --git a/completions/watch b/completions/watch index 11001c3e13e..c4f308d5c4f 100644 --- a/completions/watch +++ b/completions/watch @@ -5,7 +5,7 @@ _watch() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local offset=0 i for ((i = 1; i <= cword; i++)); do diff --git a/completions/webmitm b/completions/webmitm index 549c5ef5d7a..c89e31bd597 100644 --- a/completions/webmitm +++ b/completions/webmitm @@ -3,7 +3,7 @@ _webmitm() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur")) diff --git a/completions/wget b/completions/wget index 590bb8e6dfc..5083e7056e7 100644 --- a/completions/wget +++ b/completions/wget @@ -3,7 +3,7 @@ _wget() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --version | --help | -!(-*)[hV]) diff --git a/completions/wine b/completions/wine index 2f55afef4a6..69343c405ea 100644 --- a/completions/wine +++ b/completions/wine @@ -3,7 +3,7 @@ _wine() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --version) diff --git a/completions/withlist b/completions/withlist index 97e57ce71c6..d573ca6d146 100644 --- a/completions/withlist +++ b/completions/withlist @@ -3,7 +3,7 @@ _withlist() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--lock --interactive --run --all --quiet diff --git a/completions/wodim b/completions/wodim index b308291d330..1d6d23bc17c 100644 --- a/completions/wodim +++ b/completions/wodim @@ -3,7 +3,7 @@ _cdrecord() { local cur prev words cword - _init_completion -n = || return + _comp_initialize -n = || return local generic_options track_options track_mode diff --git a/completions/wol b/completions/wol index 3aa816ab5cb..6bfd8f68471 100644 --- a/completions/wol +++ b/completions/wol @@ -3,7 +3,7 @@ _wol() { local cur prev words cword split - _init_completion -s -n : || return + _comp_initialize -s -n : || return case $prev in --version | --help | --port | --passwd | --wait | -!(-*)[Vpw]) diff --git a/completions/wsimport b/completions/wsimport index d5bec9fe09f..627f0aaded9 100644 --- a/completions/wsimport +++ b/completions/wsimport @@ -3,7 +3,7 @@ _wsimport() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return case $prev in -help | -version | -B | -p | -wsdllocation) diff --git a/completions/wtf b/completions/wtf index 27fc10a7457..833a201bb1b 100644 --- a/completions/wtf +++ b/completions/wtf @@ -4,7 +4,7 @@ _wtf() { local cur prev words cword addf - _init_completion || return + _comp_initialize || return [[ $prev == -f ]] && _filedir && return [[ ${words[*]} == *\ -f* ]] && addf= || addf=-f diff --git a/completions/wvdial b/completions/wvdial index 0c7b8b0b86f..37075f4f199 100644 --- a/completions/wvdial +++ b/completions/wvdial @@ -3,7 +3,7 @@ _wvdial() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --config) diff --git a/completions/xdg-mime b/completions/xdg-mime index 44b50968698..6b904d8d1cd 100644 --- a/completions/xdg-mime +++ b/completions/xdg-mime @@ -10,7 +10,7 @@ _xdg_mime_mimetype() _xdg_mime() { local cur prev words cword - _init_completion || return + _comp_initialize || return local args _count_args diff --git a/completions/xdg-settings b/completions/xdg-settings index abd924648c3..9bac11ef683 100644 --- a/completions/xdg-settings +++ b/completions/xdg-settings @@ -3,7 +3,7 @@ _xdg_settings() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --help | --list | --manual | --version) diff --git a/completions/xev b/completions/xev index ce1eb946f9d..06663a67d2f 100644 --- a/completions/xev +++ b/completions/xev @@ -3,7 +3,7 @@ _comp_cmd_xev() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -display | -geometry | -bw | -id | -name) diff --git a/completions/xfreerdp b/completions/xfreerdp index 9739341c1dd..0a7ca9ee1ce 100644 --- a/completions/xfreerdp +++ b/completions/xfreerdp @@ -3,7 +3,7 @@ _xfreerdp() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return case $prev in -k) diff --git a/completions/xgamma b/completions/xgamma index 8d77ba3b392..ca3d976299e 100644 --- a/completions/xgamma +++ b/completions/xgamma @@ -3,7 +3,7 @@ _xgamma() { local cur prev words cword - _init_completion -n : || return + _comp_initialize -n : || return case "$prev" in -screen) diff --git a/completions/xhost b/completions/xhost index 648ae4f12b8..bb70f002f3b 100644 --- a/completions/xhost +++ b/completions/xhost @@ -3,7 +3,7 @@ _xhost() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $cur in +*) _known_hosts_real -p+ -- "${cur:1}" ;; diff --git a/completions/xmllint b/completions/xmllint index 6803e87c6f1..2c2de8907f7 100644 --- a/completions/xmllint +++ b/completions/xmllint @@ -3,7 +3,7 @@ _xmllint() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -o | --output) diff --git a/completions/xmlwf b/completions/xmlwf index 2c1cf60a043..4dcce9b2c03 100644 --- a/completions/xmlwf +++ b/completions/xmlwf @@ -3,7 +3,7 @@ _xmlwf() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -*d) diff --git a/completions/xmms b/completions/xmms index af4aefe98bb..10e9bcf069e 100644 --- a/completions/xmms +++ b/completions/xmms @@ -3,7 +3,7 @@ _xmms() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --help | --version | -!(-*)[hv]) diff --git a/completions/xmodmap b/completions/xmodmap index 7cfa230bd55..e900198e644 100644 --- a/completions/xmodmap +++ b/completions/xmodmap @@ -3,7 +3,7 @@ _xmodmap() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -display | -e) diff --git a/completions/xrandr b/completions/xrandr index ad8fb84e2a9..88a2c0f7234 100644 --- a/completions/xrandr +++ b/completions/xrandr @@ -44,7 +44,7 @@ _comp_cmd_xrandr_help() _xrandr() { local cur prev words cword - _init_completion || return + _comp_initialize || return local i output for ((i = cword - 1; i > 0; i--)); do diff --git a/completions/xrdb b/completions/xrdb index f46f90b9e62..6ee0c39538d 100644 --- a/completions/xrdb +++ b/completions/xrdb @@ -3,7 +3,7 @@ _xrdb() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -backup | -display | -help) diff --git a/completions/xsltproc b/completions/xsltproc index 4cb70719530..cf933aa5f05 100644 --- a/completions/xsltproc +++ b/completions/xsltproc @@ -3,7 +3,7 @@ _xsltproc() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in --output | -o) diff --git a/completions/xvfb-run b/completions/xvfb-run index aa7f0b27da7..5626f89b742 100644 --- a/completions/xvfb-run +++ b/completions/xvfb-run @@ -3,7 +3,7 @@ _xvfb_run() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local i for ((i = 1; i <= COMP_CWORD; i++)); do diff --git a/completions/xxd b/completions/xxd index cd275780b33..709ec8ea1f2 100644 --- a/completions/xxd +++ b/completions/xxd @@ -3,7 +3,7 @@ _xxd() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h | -help | -c | -cols | -g | -groupsize | -l | -len | -s | -seek | \ diff --git a/completions/xz b/completions/xz index 73958c50da1..c60d6b1a6cf 100644 --- a/completions/xz +++ b/completions/xz @@ -3,7 +3,7 @@ _xz() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return local xspec="*.@(xz|lzma|txz|tlz)" diff --git a/completions/xzdec b/completions/xzdec index 993bd2b219a..a9636e0fb15 100644 --- a/completions/xzdec +++ b/completions/xzdec @@ -3,7 +3,7 @@ _xzdec() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in --memory | -!(-*)M) diff --git a/completions/ypmatch b/completions/ypmatch index 13249f06306..085da139325 100644 --- a/completions/ypmatch +++ b/completions/ypmatch @@ -3,7 +3,7 @@ _ypmatch() { local cur prev words cword - _init_completion || return + _comp_initialize || return local map cmd=${1##*/} diff --git a/completions/yum-arch b/completions/yum-arch index 883c77e14ca..5c975081189 100644 --- a/completions/yum-arch +++ b/completions/yum-arch @@ -3,7 +3,7 @@ _yum_arch() { local cur prev words cword - _init_completion || return + _comp_initialize || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '-d -v -vv -n -c -z -s -l -q' -- "$cur")) diff --git a/completions/zopfli b/completions/zopfli index 8c02885e50d..8b18ad9dcb9 100644 --- a/completions/zopfli +++ b/completions/zopfli @@ -3,7 +3,7 @@ _zopfli() { local cur prev words cword - _init_completion || return + _comp_initialize || return case $prev in -h) diff --git a/completions/zopflipng b/completions/zopflipng index 4cbaff9c0f0..d2fb86a5edb 100644 --- a/completions/zopflipng +++ b/completions/zopflipng @@ -3,7 +3,7 @@ _zopflipng() { local cur prev words cword split - _init_completion -s || return + _comp_initialize -s || return case $prev in -h | --help) diff --git a/test/t/unit/test_unit_init_completion.py b/test/t/unit/test_unit_init_completion.py index cd81b3daa78..38d1269349b 100644 --- a/test/t/unit/test_unit_init_completion.py +++ b/test/t/unit/test_unit_init_completion.py @@ -16,13 +16,13 @@ def test_1(self, bash): "foo() { " "local cur prev words cword " "COMP_WORDS=() COMP_CWORD=0 COMP_LINE= COMP_POINT=0; " - "_init_completion; }; " + "_comp_initialize; }; " "foo; unset -f foo", ) def test_2(self, bash): output = self._test_unit( - "_init_completion %s; echo $cur,${prev-}", bash, "(a)", 0, "a", 0 + "_comp_initialize %s; echo $cur,${prev-}", bash, "(a)", 0, "a", 0 ) assert output == "," @@ -37,7 +37,7 @@ def test_redirect(self, bash, redirect): def cmd1_empty_completion_setup(self, bash): assert_bash_exec( bash, - "_cmd1() { local cur prev words cword; _init_completion; } && " + "_cmd1() { local cur prev words cword; _comp_initialize; } && " "complete -F _cmd1 cmd1", ) From fc4af85896e79625c855ee19a6d0b353ca65c79c Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Sun, 11 Sep 2022 14:22:38 +0900 Subject: [PATCH 2/4] fix(_comp_initialize): save original completion arguments Now `_comp_initialize` receives in its arguments the original arguments passed to the completion function. Arguments of other functions such as `_minimal`, `_longopt`, `_filedir_xspec`, `_known_hosts`, and `_user_at_host` are also changed. --- bash_completion | 63 +++++--- completions/2to3 | 4 +- completions/7z | 6 +- completions/_adb | 4 +- completions/_cal | 4 +- completions/_chsh | 4 +- completions/_dmesg | 4 +- completions/_eject | 4 +- completions/_hexdump | 4 +- completions/_hwclock | 4 +- completions/_ionice | 4 +- completions/_look | 4 +- completions/_mock | 4 +- completions/_modules | 4 +- completions/_mount | 4 +- completions/_mount.linux | 4 +- completions/_newgrp | 4 +- completions/_nmcli | 4 +- completions/_op | 4 +- completions/_renice | 4 +- completions/_repomanage | 4 +- completions/_reptyr | 4 +- completions/_rfkill | 4 +- completions/_rtcwake | 4 +- completions/_slackpkg | 4 +- completions/_su | 4 +- completions/_svn | 4 +- completions/_svnadmin | 4 +- completions/_svnlook | 4 +- completions/_udevadm | 4 +- completions/_umount | 4 +- completions/_umount.linux | 4 +- completions/_xm | 4 +- completions/_yum | 4 +- completions/a2x | 4 +- completions/abook | 6 +- completions/aclocal | 4 +- completions/acpi | 4 +- completions/add_members | 4 +- completions/alias | 4 +- completions/ant | 4 +- completions/apache2ctl | 4 +- completions/appdata-validate | 4 +- completions/apt-build | 4 +- completions/apt-cache | 4 +- completions/apt-get | 4 +- completions/apt-mark | 4 +- completions/aptitude | 4 +- completions/arch | 4 +- completions/arp | 4 +- completions/arping | 4 +- completions/arpspoof | 4 +- completions/asciidoc | 4 +- completions/aspell | 4 +- completions/autoconf | 4 +- completions/automake | 4 +- completions/autoreconf | 4 +- completions/autorpm | 4 +- completions/autoscan | 4 +- completions/avahi-browse | 4 +- completions/avctrl | 4 +- completions/badblocks | 4 +- completions/bind | 4 +- completions/bk | 4 +- completions/brctl | 4 +- completions/btdownloadheadless.py | 4 +- completions/bts | 4 +- completions/bzip2 | 4 +- completions/cancel | 4 +- completions/cardctl | 4 +- completions/carton | 4 +- completions/ccache | 4 +- completions/ccze | 4 +- completions/cfagent | 4 +- completions/cfrun | 4 +- completions/chage | 4 +- completions/change_pw | 4 +- completions/check_db | 4 +- completions/check_perms | 4 +- completions/checksec | 4 +- completions/chgrp | 4 +- completions/chkconfig | 4 +- completions/chmod | 4 +- completions/chown | 4 +- completions/chpasswd | 4 +- completions/chromium-browser | 4 +- completions/chronyc | 4 +- completions/chrpath | 4 +- completions/cksfv | 4 +- completions/cleanarch | 4 +- completions/clisp | 4 +- completions/clone_member | 4 +- completions/complete | 4 +- completions/config_list | 4 +- completions/configure | 4 +- completions/convert | 44 +++--- completions/cowsay | 4 +- completions/cpan2dist | 4 +- completions/cpio | 4 +- completions/cppcheck | 4 +- completions/crontab | 4 +- completions/cryptsetup | 4 +- completions/curl | 4 +- completions/cvs | 4 +- completions/cvsps | 4 +- completions/dd | 4 +- completions/declare | 4 +- completions/deja-dup | 4 +- completions/desktop-file-validate | 4 +- completions/dhclient | 4 +- completions/dict | 4 +- completions/dmypy | 4 +- completions/dnssec-keygen | 4 +- completions/dnsspoof | 4 +- completions/dot | 4 +- completions/dpkg | 8 +- completions/dpkg-source | 4 +- completions/dselect | 4 +- completions/dsniff | 4 +- completions/dumpdb | 4 +- completions/dumpe2fs | 4 +- completions/e2freefrag | 4 +- completions/e2label | 4 +- completions/ebtables | 4 +- completions/ecryptfs-migrate-home | 4 +- completions/eog | 4 +- completions/ether-wake | 4 +- completions/evince | 4 +- completions/export | 4 +- completions/faillog | 4 +- completions/fbgs | 4 +- completions/fbi | 4 +- completions/feh | 4 +- completions/file | 4 +- completions/file-roller | 8 +- completions/filefrag | 4 +- completions/filesnarf | 4 +- completions/find | 4 +- completions/find_member | 4 +- completions/fio | 4 +- completions/firefox | 4 +- completions/flake8 | 4 +- completions/freebsd-update | 4 +- completions/freeciv | 4 +- completions/freeciv-server | 4 +- completions/function | 4 +- completions/fusermount | 4 +- completions/gcc | 5 +- completions/gcl | 4 +- completions/gdb | 4 +- completions/genaliases | 4 +- completions/gendiff | 4 +- completions/genisoimage | 4 +- completions/geoiplookup | 4 +- completions/getconf | 4 +- completions/getent | 4 +- completions/gkrellm | 4 +- completions/gm | 4 +- completions/gnatmake | 4 +- completions/gnokii | 4 +- completions/gnome-mplayer | 4 +- completions/gnome-screenshot | 4 +- completions/gpasswd | 4 +- completions/gpg | 4 +- completions/gpg2 | 4 +- completions/gpgv | 4 +- completions/gphoto2 | 4 +- completions/gprof | 4 +- completions/groupadd | 4 +- completions/groupdel | 4 +- completions/groupmems | 4 +- completions/groupmod | 4 +- completions/growisofs | 4 +- completions/grpck | 4 +- completions/gssdp-discover | 4 +- completions/gzip | 4 +- completions/hcitool | 32 ++-- completions/hddtemp | 4 +- completions/hid2hci | 4 +- completions/hostname | 4 +- completions/hping2 | 4 +- completions/htop | 4 +- completions/htpasswd | 4 +- completions/hunspell | 4 +- completions/iconv | 4 +- completions/id | 4 +- completions/idn | 4 +- completions/ifstat | 4 +- completions/iftop | 4 +- completions/ifup | 4 +- completions/influx | 4 +- completions/info | 4 +- completions/inject | 4 +- completions/inotifywait | 4 +- completions/insmod | 4 +- completions/installpkg | 4 +- completions/interdiff | 4 +- completions/invoke-rc.d | 4 +- completions/ip | 4 +- completions/ipcalc | 4 +- completions/iperf | 4 +- completions/ipmitool | 4 +- completions/ipsec | 8 +- completions/iptables | 4 +- completions/ipv6calc | 4 +- completions/iscsiadm | 4 +- completions/isort | 4 +- completions/isql | 4 +- completions/iwconfig | 4 +- completions/iwlist | 4 +- completions/iwpriv | 4 +- completions/iwspy | 4 +- completions/jar | 6 +- completions/jarsigner | 4 +- completions/java | 12 +- completions/javaws | 4 +- completions/jpegoptim | 4 +- completions/jps | 4 +- completions/jq | 4 +- completions/jshint | 4 +- completions/json_xs | 4 +- completions/jsonschema | 4 +- completions/k3b | 4 +- completions/kcov | 4 +- completions/kill | 4 +- completions/killall | 4 +- completions/kldload | 4 +- completions/kldunload | 4 +- completions/koji | 4 +- completions/ktutil | 4 +- completions/larch | 4 +- completions/lastlog | 4 +- completions/ldapsearch | 28 ++-- completions/ldapvi | 4 +- completions/lftp | 4 +- completions/lftpget | 4 +- completions/lilo | 4 +- completions/links | 4 +- completions/lintian | 8 +- completions/lisp | 4 +- completions/list_admins | 4 +- completions/list_lists | 4 +- completions/list_members | 4 +- completions/list_owners | 4 +- completions/locale-gen | 4 +- completions/lpq | 4 +- completions/lpr | 4 +- completions/lrzip | 4 +- completions/lsof | 4 +- completions/lspci | 4 +- completions/lsscsi | 4 +- completions/lsusb | 4 +- completions/lua | 4 +- completions/luac | 4 +- completions/luseradd | 4 +- completions/luserdel | 4 +- completions/lvm | 144 +++++++++--------- completions/lz4 | 4 +- completions/lzip | 4 +- completions/lzma | 4 +- completions/lzop | 4 +- completions/macof | 4 +- completions/mailmanctl | 4 +- completions/make | 4 +- completions/makepkg | 6 +- completions/man | 4 +- completions/mc | 4 +- completions/mcrypt | 4 +- completions/mdadm | 4 +- completions/mdtool | 4 +- completions/medusa | 4 +- completions/mii-diag | 4 +- completions/mii-tool | 4 +- completions/minicom | 4 +- completions/mkinitrd | 4 +- completions/mktemp | 4 +- completions/mmsitepass | 4 +- completions/modinfo | 4 +- completions/modprobe | 4 +- completions/monodevelop | 4 +- completions/mplayer | 4 +- completions/mr | 4 +- completions/msynctool | 4 +- completions/mtx | 4 +- completions/munin-node-configure | 4 +- completions/munin-run | 4 +- completions/munin-update | 4 +- completions/munindoc | 4 +- completions/mussh | 6 +- completions/mutt | 4 +- completions/mypy | 4 +- completions/mysql | 4 +- completions/mysqladmin | 4 +- completions/nc | 4 +- completions/ncftp | 4 +- completions/nethogs | 4 +- completions/newlist | 4 +- completions/newusers | 4 +- completions/ngrep | 4 +- completions/nmap | 4 +- completions/nproc | 4 +- completions/nslookup | 8 +- completions/nsupdate | 4 +- completions/ntpdate | 4 +- completions/oggdec | 4 +- completions/openssl | 4 +- completions/opera | 4 +- completions/optipng | 4 +- completions/p4 | 4 +- completions/pack200 | 4 +- completions/passwd | 4 +- completions/patch | 4 +- completions/pdftoppm | 4 +- completions/pdftotext | 4 +- completions/perl | 8 +- completions/perlcritic | 4 +- completions/perltidy | 4 +- completions/pgrep | 4 +- completions/pidof | 4 +- completions/pine | 4 +- completions/ping | 4 +- completions/pkg-config | 4 +- completions/pkg_delete | 4 +- completions/pkgadd | 4 +- completions/pkgrm | 4 +- completions/pkgtool | 4 +- completions/pkgutil | 4 +- completions/plague-client | 4 +- completions/pm-hibernate | 4 +- completions/pm-is-supported | 4 +- completions/pm-powersave | 4 +- completions/pngfix | 4 +- completions/portinstall | 4 +- completions/portsnap | 4 +- completions/portupgrade | 4 +- completions/postcat | 4 +- completions/postconf | 4 +- completions/postfix | 4 +- completions/postmap | 4 +- completions/postsuper | 4 +- completions/povray | 4 +- completions/prelink | 4 +- completions/printenv | 4 +- completions/protoc | 4 +- completions/ps | 4 +- completions/psql | 20 +-- completions/puppet | 4 +- completions/pv | 4 +- completions/pwck | 4 +- completions/pwd | 4 +- completions/pwdx | 4 +- completions/pwgen | 4 +- completions/pycodestyle | 4 +- completions/pydoc | 4 +- completions/pydocstyle | 4 +- completions/pyflakes | 4 +- completions/pylint | 4 +- completions/pytest | 4 +- completions/python | 4 +- completions/pyvenv | 6 +- completions/qdbus | 4 +- completions/qemu | 4 +- completions/qrunner | 4 +- completions/querybts | 4 +- completions/quota | 20 +-- completions/radvdump | 4 +- completions/rcs | 4 +- completions/rdesktop | 4 +- completions/remove_members | 4 +- completions/removepkg | 4 +- completions/reportbug | 4 +- completions/resolvconf | 4 +- completions/ri | 4 +- completions/rmlist | 4 +- completions/rmmod | 4 +- completions/route | 4 +- completions/rpcdebug | 4 +- completions/rpm | 8 +- completions/rpm2tgz | 4 +- completions/rpmcheck | 4 +- completions/rrdtool | 4 +- completions/rsync | 4 +- completions/sbcl | 4 +- completions/sbopkg | 4 +- completions/screen | 4 +- completions/scrub | 4 +- completions/secret-tool | 4 +- completions/sh | 4 +- completions/sha256sum | 6 +- completions/shellcheck | 4 +- completions/sitecopy | 4 +- completions/slapt-get | 4 +- completions/slapt-src | 4 +- completions/smartctl | 4 +- completions/smbclient | 28 ++-- completions/snownews | 4 +- completions/sqlite3 | 4 +- completions/ss | 4 +- completions/ssh | 12 +- completions/ssh-add | 4 +- completions/ssh-copy-id | 4 +- completions/ssh-keygen | 4 +- completions/ssh-keyscan | 4 +- completions/sshfs | 4 +- completions/sshmitm | 4 +- completions/sshow | 4 +- completions/strace | 4 +- completions/strings | 4 +- completions/sudo | 4 +- completions/svcadm | 4 +- completions/svk | 4 +- completions/sync_members | 4 +- completions/synclient | 4 +- completions/sysbench | 4 +- completions/sysctl | 4 +- completions/tar | 8 +- completions/tcpdump | 4 +- completions/tcpkill | 4 +- completions/tcpnice | 4 +- completions/timeout | 4 +- completions/tipc | 4 +- completions/tox | 4 +- completions/tracepath | 4 +- completions/tree | 4 +- completions/truncate | 4 +- completions/tshark | 4 +- completions/tsig-keygen | 4 +- completions/tune2fs | 4 +- completions/ulimit | 4 +- completions/unace | 4 +- completions/unpack200 | 4 +- completions/unrar | 4 +- completions/unshunt | 4 +- completions/update-alternatives | 4 +- completions/update-rc.d | 4 +- completions/upgradepkg | 4 +- completions/urlsnarf | 4 +- completions/uscan | 4 +- completions/useradd | 4 +- completions/userdel | 4 +- completions/usermod | 4 +- completions/valgrind | 4 +- completions/vipw | 4 +- completions/vmstat | 4 +- completions/vncviewer | 10 +- completions/vpnc | 4 +- completions/watch | 4 +- completions/webmitm | 4 +- completions/wget | 4 +- completions/wine | 4 +- completions/withlist | 4 +- completions/wodim | 4 +- completions/wol | 4 +- completions/wsimport | 4 +- completions/wtf | 4 +- completions/wvdial | 4 +- completions/xdg-mime | 4 +- completions/xdg-settings | 4 +- completions/xev | 4 +- completions/xfreerdp | 4 +- completions/xgamma | 4 +- completions/xhost | 4 +- completions/xmllint | 4 +- completions/xmlwf | 4 +- completions/xmms | 4 +- completions/xmodmap | 4 +- completions/xrandr | 4 +- completions/xrdb | 4 +- completions/xsltproc | 4 +- completions/xvfb-run | 4 +- completions/xxd | 4 +- completions/xz | 4 +- completions/xzdec | 4 +- completions/ypmatch | 4 +- completions/yum-arch | 4 +- completions/zopfli | 4 +- completions/zopflipng | 4 +- test/t/unit/Makefile.am | 2 +- ..._completion.py => test_unit_initialize.py} | 4 +- 479 files changed, 1175 insertions(+), 1155 deletions(-) rename test/t/unit/{test_unit_init_completion.py => test_unit_initialize.py} (92%) diff --git a/bash_completion b/bash_completion index bbf9f09fd30..680f8bdfce2 100644 --- a/bash_completion +++ b/bash_completion @@ -1034,13 +1034,27 @@ _comp_variable_assignments() # -o XSPEC Passed to _filedir as first arg for other output redirections # -i XSPEC Passed to _filedir as first arg for stdin redirections # -s Split long options with _split_longopt, implies -n = +# @param $1...$3 args Original arguments specified to the completion function. +# The first argument $1 is command name. The second +# argument $2 is the string before the cursor in the +# current word. The third argument $3 is the previous +# word. +# @var[out] cur Reconstructed current word +# @var[out] prev Reconstructed previous word +# @var[out] words Reconstructed words +# @var[out] cword Current word index in `words` +# @var[out] comp_args Original arguments specified to the completion function +# are saved. +# @var[out,opt] split When "-s" is specified, `true/false` is set depending on +# whether the split happened. # @return True (0) if completion needs further processing, # False (> 0) no further processing is necessary. # _comp_initialize() { - local exclude="" flag outx errx inx OPTIND=1 + local exclude="" outx errx inx + local flag OPTIND=1 OPTARG='' OPTERR=0 while getopts "n:e:o:i:s" flag "$@"; do case $flag in n) exclude+=$OPTARG ;; @@ -1057,6 +1071,8 @@ _comp_initialize() ;; esac done + shift "$((OPTIND - 1))" + (($#)) && comp_args=("$@") COMPREPLY=() local redir='@(?(+([0-9])|{[a-zA-Z_]*([a-zA-Z_0-9])})@(>?([>|&])|&])|<?(>))' @@ -1108,6 +1124,7 @@ _comp_initialize() return 0 } +_comp_deprecate_func _init_completion _comp_initialize # Helper function for _parse_help and _parse_usage. # @return True (0) if an option was found, False (> 0) otherwise @@ -1605,8 +1622,8 @@ _services() # _service() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return # don't complete past 2nd token ((cword > 2)) && return @@ -1895,8 +1912,8 @@ _bashcomp_try_faketty() # _user_at_host() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return if [[ $cur == *@* ]]; then _known_hosts_real "$cur" @@ -1911,8 +1928,8 @@ shopt -u hostcomplete && complete -F _user_at_host talk ytalk finger # `_known_hosts_real' instead. _known_hosts() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return # NOTE: Using `_known_hosts' as a helper function and passing options # to `_known_hosts' is deprecated: Use `_known_hosts_real' instead. @@ -2193,8 +2210,8 @@ complete -F _known_hosts traceroute traceroute6 \ # _cd() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_help help "$1")' -- "$cur")) @@ -2301,11 +2318,18 @@ _comp_command_offset() local retry_count=0 while true; do # loop for the retry request by status 124 + local args original_cur=${comp_args[1]-$cur} + if ((${#COMP_WORDS[@]} >= 2)); then + args=("$cmd" "$original_cur" "${COMP_WORDS[-2]}") + else + args=("$cmd" "$original_cur") + fi + if [[ ! $cspec ]]; then if ((${#COMPREPLY[@]} == 0)); then # XXX will probably never happen as long as completion loader loads # *something* for every command thrown at it ($cspec != empty) - _minimal + _minimal "${args[@]}" fi elif [[ $cspec == *' -F '* ]]; then # complete -F @@ -2313,12 +2337,7 @@ _comp_command_offset() # get function name local func=${cspec#* -F } func=${func%% *} - - if ((${#COMP_WORDS[@]} >= 2)); then - $func "$cmd" "${COMP_WORDS[-1]}" "${COMP_WORDS[-2]}" - else - $func "$cmd" "${COMP_WORDS[-1]}" - fi + $func "${args[@]}" # restart completion (once) if function exited with 124 if (($? == 124 && retry_count++ == 0)); then @@ -2395,8 +2414,8 @@ _complete_as_root() _longopt() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case "${prev,,}" in --help | --usage | --version) @@ -2454,8 +2473,8 @@ declare -Ag _xspecs _filedir_xspec() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return _tilde "$cur" || return @@ -2576,8 +2595,8 @@ unset -f _install_xspec # Minimal completion to use as fallback in _completion_loader. _minimal() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return $split && return _filedir } diff --git a/completions/2to3 b/completions/2to3 index 7624a2835ee..b0a44c12155 100644 --- a/completions/2to3 +++ b/completions/2to3 @@ -2,8 +2,8 @@ _2to3() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -h | --help | --add-suffix) diff --git a/completions/7z b/completions/7z index 505efe69b72..ed7e0ccfdbb 100644 --- a/completions/7z +++ b/completions/7z @@ -2,8 +2,8 @@ _7z() { - local cur prev words cword - _comp_initialize -n = || return + local cur prev words cword comp_args + _comp_initialize -n = -- "$@" || return if ((cword == 1)); then COMPREPLY=($(compgen -W 'a b d e h i l rn t u x' -- "$cur")) @@ -99,7 +99,7 @@ _7z() local args _count_args "=" if ((args == 2)); then - _filedir_xspec unzip + _filedir_xspec unzip "${@:2}" # TODO: parsing 7z i output? # - how to figure out if the format is input or output? # - find string Formats:, read until next empty line diff --git a/completions/_adb b/completions/_adb index 0bd1512a14a..405f5068ba4 100644 --- a/completions/_adb +++ b/completions/_adb @@ -12,8 +12,8 @@ _adb_command_usage() _adb() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -s | -p | --algo | --key | --iv) diff --git a/completions/_cal b/completions/_cal index 72f782d1a6b..aafd87f44b3 100644 --- a/completions/_cal +++ b/completions/_cal @@ -5,8 +5,8 @@ _cal() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -m) diff --git a/completions/_chsh b/completions/_chsh index 4281d89e69d..09ec00f3d5a 100644 --- a/completions/_chsh +++ b/completions/_chsh @@ -5,8 +5,8 @@ _chsh() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local word chroot for word in "${words[@]}"; do diff --git a/completions/_dmesg b/completions/_dmesg index a792e5756df..4783fa63544 100644 --- a/completions/_dmesg +++ b/completions/_dmesg @@ -7,8 +7,8 @@ _dmesg() { [[ $OSTYPE == *solaris* ]] && return # no args there - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h | --help | -V | --version | -s | --buffer-size | -M | -N) diff --git a/completions/_eject b/completions/_eject index 20ee95e1ca7..6c34b8925d1 100644 --- a/completions/_eject +++ b/completions/_eject @@ -5,8 +5,8 @@ _eject() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h | --help | -V | --version | -c | --changerslot | -x | --cdspeed) diff --git a/completions/_hexdump b/completions/_hexdump index a8a534c0ac5..5f5bd8a00b8 100644 --- a/completions/_hexdump +++ b/completions/_hexdump @@ -5,8 +5,8 @@ _hexdump() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -V | -e | -n | -s) diff --git a/completions/_hwclock b/completions/_hwclock index 5a8c8054331..c936ff48453 100644 --- a/completions/_hwclock +++ b/completions/_hwclock @@ -5,8 +5,8 @@ _hwclock() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h | --help | -V | --version | --date | --epoch) diff --git a/completions/_ionice b/completions/_ionice index b2ca0497777..0559c496d8f 100644 --- a/completions/_ionice +++ b/completions/_ionice @@ -5,8 +5,8 @@ _ionice() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local offset=0 i for ((i = 1; i <= cword; i++)); do diff --git a/completions/_look b/completions/_look index 73486ceef69..0bb4a2b9155 100644 --- a/completions/_look +++ b/completions/_look @@ -5,8 +5,8 @@ _look() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if ((cword == 1)); then COMPREPLY=($(compgen -W '$(look "$cur" 2>/dev/null)' -- "$cur")) diff --git a/completions/_mock b/completions/_mock index c34a7098992..37c502a0229 100644 --- a/completions/_mock +++ b/completions/_mock @@ -5,8 +5,8 @@ _mock() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local plugins='tmpfs root_cache yum_cache bind_mount ccache' local cfgdir=/etc/mock count=0 i diff --git a/completions/_modules b/completions/_modules index e6778157ca4..b1e58106d21 100644 --- a/completions/_modules +++ b/completions/_modules @@ -47,8 +47,8 @@ _module_avail() # A completion function for the module alias _module() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if ((cword == 1)); then # First parameter on line -- we expect it to be a mode selection diff --git a/completions/_mount b/completions/_mount index 3fcbaa4adb2..02e2ead1ed6 100644 --- a/completions/_mount +++ b/completions/_mount @@ -16,8 +16,8 @@ fi # _mount() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return local sm host diff --git a/completions/_mount.linux b/completions/_mount.linux index 7e079be82aa..5922246a517 100644 --- a/completions/_mount.linux +++ b/completions/_mount.linux @@ -5,8 +5,8 @@ _mount() { - local cur prev words cword - _comp_initialize -n =: || return + local cur prev words cword comp_args + _comp_initialize -n =: -- "$@" || return local split=false case "$prev" in diff --git a/completions/_newgrp b/completions/_newgrp index b1cc393c39f..4af9939d416 100644 --- a/completions/_newgrp +++ b/completions/_newgrp @@ -5,8 +5,8 @@ _newgrp() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == "-" ]]; then COMPREPLY=(-) diff --git a/completions/_nmcli b/completions/_nmcli index 79665c3f362..223996ee924 100644 --- a/completions/_nmcli +++ b/completions/_nmcli @@ -36,8 +36,8 @@ _nmcli_ab_bssid() _nmcli() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -m | --mode) diff --git a/completions/_op b/completions/_op index 63d885d0557..bf1beb9b418 100644 --- a/completions/_op +++ b/completions/_op @@ -27,8 +27,8 @@ _op_command_options() _op() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local command i for ((i = 1; i < cword; i++)); do diff --git a/completions/_renice b/completions/_renice index e9cd22350d6..4cfc4eb5259 100644 --- a/completions/_renice +++ b/completions/_renice @@ -5,8 +5,8 @@ _renice() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local command=$1 curopt i=0 diff --git a/completions/_repomanage b/completions/_repomanage index d36e0bd8b62..4cb9d6a8c1c 100644 --- a/completions/_repomanage +++ b/completions/_repomanage @@ -5,8 +5,8 @@ _repomanage() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return [[ $prev == -@([hk]|-help|-keep) ]] && return diff --git a/completions/_reptyr b/completions/_reptyr index fae617b3c1a..0f5eb9ebdb2 100644 --- a/completions/_reptyr +++ b/completions/_reptyr @@ -5,8 +5,8 @@ _reptyr() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -l) diff --git a/completions/_rfkill b/completions/_rfkill index e1c9719069a..c04ad896eae 100644 --- a/completions/_rfkill +++ b/completions/_rfkill @@ -5,8 +5,8 @@ _rfkill() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--version' -- "$cur")) diff --git a/completions/_rtcwake b/completions/_rtcwake index ce9bb9684a8..c1887a62c32 100644 --- a/completions/_rtcwake +++ b/completions/_rtcwake @@ -5,8 +5,8 @@ _rtcwake() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case "$prev" in --help | -h | --version | -V | --seconds | -s | --time | -t) diff --git a/completions/_slackpkg b/completions/_slackpkg index 65bbbc6a8df..8fcd8f18604 100644 --- a/completions/_slackpkg +++ b/completions/_slackpkg @@ -6,8 +6,8 @@ _slackpkg() { - local cur prev words cword - _comp_initialize -n = || return + local cur prev words cword comp_args + _comp_initialize -n = -- "$@" || return local split=false if [[ $cur == -?*=* ]]; then diff --git a/completions/_su b/completions/_su index a0afec87ef9..1d10a8cd171 100644 --- a/completions/_su +++ b/completions/_su @@ -10,8 +10,8 @@ fi _su() { # linux-specific completion - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case "$prev" in -s | --shell) diff --git a/completions/_svn b/completions/_svn index 4bc2fba1e71..b25d908fe63 100644 --- a/completions/_svn +++ b/completions/_svn @@ -5,8 +5,8 @@ _svn() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local commands commands='add blame praise annotate ann cat checkout co cleanup commit \ diff --git a/completions/_svnadmin b/completions/_svnadmin index 52de46c0c08..d971c9b98de 100644 --- a/completions/_svnadmin +++ b/completions/_svnadmin @@ -5,8 +5,8 @@ _svnadmin() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local commands commands='create deltify dump help ? hotcopy list-dblogs list-unused-dblogs diff --git a/completions/_svnlook b/completions/_svnlook index aa190eab132..231efdfac5c 100644 --- a/completions/_svnlook +++ b/completions/_svnlook @@ -5,8 +5,8 @@ _svnlook() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local commands commands='author cat changed date diff dirs-changed help ? h history info diff --git a/completions/_udevadm b/completions/_udevadm index 91b90165585..87fb087a799 100644 --- a/completions/_udevadm +++ b/completions/_udevadm @@ -5,8 +5,8 @@ _udevadm() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local i udevcmd for ((i = 1; i < cword; i++)); do diff --git a/completions/_umount b/completions/_umount index 1ab09fd79c7..b025cf635e3 100644 --- a/completions/_umount +++ b/completions/_umount @@ -13,8 +13,8 @@ fi # _umount() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local IFS=$'\n' COMPREPLY=($(compgen -W '$(mount | cut -d" " -f 3)' -- "$cur")) diff --git a/completions/_umount.linux b/completions/_umount.linux index 113434b69ff..43026dc8172 100644 --- a/completions/_umount.linux +++ b/completions/_umount.linux @@ -95,8 +95,8 @@ _linux_fstab() _umount() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case "$prev" in -t) diff --git a/completions/_xm b/completions/_xm index 3186b318ea1..c2a9ca90a9b 100644 --- a/completions/_xm +++ b/completions/_xm @@ -18,8 +18,8 @@ _xen_domain_ids() _xm() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return # TODO: _split_longopt diff --git a/completions/_yum b/completions/_yum index ffea2e5530c..0a033b82413 100644 --- a/completions/_yum +++ b/completions/_yum @@ -39,8 +39,8 @@ _yum_plugins() _yum() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local special i for ((i = 1; i < ${#words[@]} - 1; i++)); do diff --git a/completions/a2x b/completions/a2x index 124334046e9..bcfb508f2ec 100644 --- a/completions/a2x +++ b/completions/a2x @@ -2,8 +2,8 @@ _a2x() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --attribute | --asciidoc-opts | --dblatex-opts | --fop-opts | --help | \ diff --git a/completions/abook b/completions/abook index b4a3f4401f4..a13068c63cb 100644 --- a/completions/abook +++ b/completions/abook @@ -2,8 +2,8 @@ _abook() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return # abook only takes options, tabbing after command name adds a single dash [[ $cword -eq 1 && ! $cur ]] && @@ -15,7 +15,7 @@ _abook() case $cur in -*) - _longopt "$1" + _longopt "$@" return ;; esac diff --git a/completions/aclocal b/completions/aclocal index 04d9d1be55b..e9e4ef13c72 100644 --- a/completions/aclocal +++ b/completions/aclocal @@ -2,8 +2,8 @@ _aclocal() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case "$prev" in --help | --print-ac-dir | --version) diff --git a/completions/acpi b/completions/acpi index 5475d2a067b..288081c4cfd 100644 --- a/completions/acpi +++ b/completions/acpi @@ -2,8 +2,8 @@ _acpi() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version | -!(-*)[hv]) diff --git a/completions/add_members b/completions/add_members index 00c90e31ed8..7748794f842 100644 --- a/completions/add_members +++ b/completions/add_members @@ -2,8 +2,8 @@ _add_members() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -r | -d | --regular-members-file | --digest-members-file) diff --git a/completions/alias b/completions/alias index c9d55c4b934..b1038de3d42 100644 --- a/completions/alias +++ b/completions/alias @@ -2,8 +2,8 @@ _alias() { - local cur prev words cword - _comp_initialize -n = || return + local cur prev words cword comp_args + _comp_initialize -n = -- "$@" || return case ${words[@]} in *[^=]) diff --git a/completions/ant b/completions/ant index 2241342fd44..98971e80bd8 100644 --- a/completions/ant +++ b/completions/ant @@ -27,8 +27,8 @@ _ant_parse_targets() _ant() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h | -help | --h | --help | -projecthelp | -p | -version | -diagnostics) diff --git a/completions/apache2ctl b/completions/apache2ctl index 2f388fbdd38..cb875f44c26 100644 --- a/completions/apache2ctl +++ b/completions/apache2ctl @@ -2,8 +2,8 @@ _apache2ctl() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local APWORDS APWORDS=$($1 2>&1 >/dev/null | awk 'NR<2 { print $3; exit }' | diff --git a/completions/appdata-validate b/completions/appdata-validate index 12e16053377..79da5e3590f 100644 --- a/completions/appdata-validate +++ b/completions/appdata-validate @@ -2,8 +2,8 @@ _appdata_validate() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -h | --help | --version) diff --git a/completions/apt-build b/completions/apt-build index b257d926b6a..d305ff57cad 100644 --- a/completions/apt-build +++ b/completions/apt-build @@ -2,8 +2,8 @@ _apt_build() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local special i for ((i = 1; i < ${#words[@]} - 1; i++)); do diff --git a/completions/apt-cache b/completions/apt-cache index ed0b15cefb5..3650299e814 100644 --- a/completions/apt-cache +++ b/completions/apt-cache @@ -25,8 +25,8 @@ _comp_deprecate_func _apt_cache_src_packages _comp_xfunc_apt_cache_src_packages _apt_cache() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local special ispecial if [[ $cur != show ]]; then diff --git a/completions/apt-get b/completions/apt-get index d1a5e95faec..903459aa56e 100644 --- a/completions/apt-get +++ b/completions/apt-get @@ -17,8 +17,8 @@ _comp_deprecate_func _comp_cmd_apt_get_installed_packages _comp_xfunc_apt_get_in _apt_get() { - local cur prev words cword package - _comp_initialize -n ':=' || return + local cur prev words cword comp_args package + _comp_initialize -n ':=' -- "$@" || return local special i for ((i = 1; i < ${#words[@]} - 1; i++)); do diff --git a/completions/apt-mark b/completions/apt-mark index 28e432b114d..45bc72846f4 100644 --- a/completions/apt-mark +++ b/completions/apt-mark @@ -2,8 +2,8 @@ _comp_cmd_apt_mark() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local special i for ((i = 1; i < ${#words[@]} - 1; i++)); do diff --git a/completions/aptitude b/completions/aptitude index ae13fe62838..fc00a411f5c 100644 --- a/completions/aptitude +++ b/completions/aptitude @@ -15,8 +15,8 @@ fi _aptitude() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local special i for ((i = 1; i < ${#words[@]} - 1; i++)); do diff --git a/completions/arch b/completions/arch index 7c2d4b80836..478626a2be2 100644 --- a/completions/arch +++ b/completions/arch @@ -5,8 +5,8 @@ _comp_have_command mailmanctl && _arch() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -w | -g | -d | --welcome-msg | --goodbye-msg | --digest) diff --git a/completions/arp b/completions/arp index 85696189c25..8da4bc0ab8f 100644 --- a/completions/arp +++ b/completions/arp @@ -2,8 +2,8 @@ _arp() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --device | -!(-*)i) diff --git a/completions/arping b/completions/arping index 2556257b36f..58b38fed622 100644 --- a/completions/arping +++ b/completions/arping @@ -2,8 +2,8 @@ _arping() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*c | -*w) diff --git a/completions/arpspoof b/completions/arpspoof index 690265da93f..a095842c7ab 100644 --- a/completions/arpspoof +++ b/completions/arpspoof @@ -2,8 +2,8 @@ _arpspoof() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -i) diff --git a/completions/asciidoc b/completions/asciidoc index 83dd75750ac..b70c7d404cd 100644 --- a/completions/asciidoc +++ b/completions/asciidoc @@ -9,8 +9,8 @@ _comp_deprecate_func _asciidoc_doctype _comp_xfunc_asciidoc_doctype _asciidoc() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --attribute | -!(-*)a) diff --git a/completions/aspell b/completions/aspell index 5a3d456a247..d3bffe7ebc1 100644 --- a/completions/aspell +++ b/completions/aspell @@ -18,8 +18,8 @@ _aspell_dictionary() _aspell() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -c | -p | check | --conf | --personal | --repl | --per-conf) diff --git a/completions/autoconf b/completions/autoconf index 69d92703b1f..17eaee82dad 100644 --- a/completions/autoconf +++ b/completions/autoconf @@ -2,8 +2,8 @@ _autoconf() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case "$prev" in --help | -h | --version | -V | --trace | -t) diff --git a/completions/automake b/completions/automake index 7100cd39c2d..46230144567 100644 --- a/completions/automake +++ b/completions/automake @@ -2,8 +2,8 @@ _automake() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case "$prev" in --help | --version) diff --git a/completions/autoreconf b/completions/autoreconf index a2aae8f0791..371d724d69b 100644 --- a/completions/autoreconf +++ b/completions/autoreconf @@ -2,8 +2,8 @@ _autoreconf() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case "$prev" in --help | -h | --version | -V) diff --git a/completions/autorpm b/completions/autorpm index 1b6b0f64adc..8c56c8ae0b5 100644 --- a/completions/autorpm +++ b/completions/autorpm @@ -2,8 +2,8 @@ _autorpm() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return COMPREPLY=($(compgen -W '--notty --debug --help --version auto add fullinfo info help install list remove set' -- "$cur")) diff --git a/completions/autoscan b/completions/autoscan index 9ff1aed6c8d..e24a48547c6 100644 --- a/completions/autoscan +++ b/completions/autoscan @@ -2,8 +2,8 @@ _autoscan() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case "$prev" in --help | --version | -!(-*)[hV]) diff --git a/completions/avahi-browse b/completions/avahi-browse index 32afa13f681..e1e47431f64 100644 --- a/completions/avahi-browse +++ b/completions/avahi-browse @@ -2,8 +2,8 @@ _comp_cmd_avahi_browse() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --domain | -!(-*)D) diff --git a/completions/avctrl b/completions/avctrl index c19ad7a41b0..9bc9f559ef9 100644 --- a/completions/avctrl +++ b/completions/avctrl @@ -2,8 +2,8 @@ _avctrl() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--help --quiet' -- "$cur")) diff --git a/completions/badblocks b/completions/badblocks index bc533306f12..af5759a3c4f 100644 --- a/completions/badblocks +++ b/completions/badblocks @@ -2,8 +2,8 @@ _badblocks() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*[bcedpt]) diff --git a/completions/bind b/completions/bind index cee916b6a91..81e40442e5b 100644 --- a/completions/bind +++ b/completions/bind @@ -2,8 +2,8 @@ _bind() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*[lpPsSvVrxX]) diff --git a/completions/bk b/completions/bk index b22b5bc6102..f2f8f8fa982 100644 --- a/completions/bk +++ b/completions/bk @@ -3,8 +3,8 @@ _bk() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local BKCMDS="$(bk help topics 2>/dev/null | awk '/^ bk/ { print $2 }' | xargs printf '%s ')" diff --git a/completions/brctl b/completions/brctl index 620f77d569d..bc496477a96 100644 --- a/completions/brctl +++ b/completions/brctl @@ -2,8 +2,8 @@ _brctl() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local command=${words[1]} diff --git a/completions/btdownloadheadless.py b/completions/btdownloadheadless.py index 18cb8f81d50..5658b72a0ea 100644 --- a/completions/btdownloadheadless.py +++ b/completions/btdownloadheadless.py @@ -2,8 +2,8 @@ _btdownload() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --responsefile | --saveas) diff --git a/completions/bts b/completions/bts index 24616e82e7e..6bbf518f2df 100644 --- a/completions/bts +++ b/completions/bts @@ -18,8 +18,8 @@ _src_packages_with_prefix() _bts() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in show | bugs) diff --git a/completions/bzip2 b/completions/bzip2 index 22e85b9b4c2..50c9f789df4 100644 --- a/completions/bzip2 +++ b/completions/bzip2 @@ -2,8 +2,8 @@ _bzip2() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | -!(-*)[bhp]) diff --git a/completions/cancel b/completions/cancel index ef1907c5146..9096548a270 100644 --- a/completions/cancel +++ b/completions/cancel @@ -2,8 +2,8 @@ _cancel() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h) diff --git a/completions/cardctl b/completions/cardctl index 107867eaa14..3ba7454a98e 100644 --- a/completions/cardctl +++ b/completions/cardctl @@ -2,8 +2,8 @@ _cardctl() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if ((cword == 1)); then COMPREPLY=($(compgen -W 'status config ident suspend resume reset diff --git a/completions/carton b/completions/carton index cabf38827bc..9e3e53122c5 100644 --- a/completions/carton +++ b/completions/carton @@ -15,8 +15,8 @@ _carton_command_help() _carton() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local i command for ((i = 1; i < cword; i++)); do diff --git a/completions/ccache b/completions/ccache index 1991a5a1499..93a512eac6a 100644 --- a/completions/ccache +++ b/completions/ccache @@ -2,8 +2,8 @@ _ccache() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local i for ((i = 1; i <= COMP_CWORD; i++)); do diff --git a/completions/ccze b/completions/ccze index 0309231f322..8031473a764 100644 --- a/completions/ccze +++ b/completions/ccze @@ -2,8 +2,8 @@ _ccze() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -'?' | --help | --usage | -V | --version) diff --git a/completions/cfagent b/completions/cfagent index bd2e365b620..531f34c5361 100644 --- a/completions/cfagent +++ b/completions/cfagent @@ -2,8 +2,8 @@ _cfagent() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -f | --file) diff --git a/completions/cfrun b/completions/cfrun index 5b5bc994c59..d2d8f4a30fe 100644 --- a/completions/cfrun +++ b/completions/cfrun @@ -2,8 +2,8 @@ _cfrun() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local i section=1 for ((i = 1; i < cword; i++)); do diff --git a/completions/chage b/completions/chage index 488ae15c20a..470320c0945 100644 --- a/completions/chage +++ b/completions/chage @@ -2,8 +2,8 @@ _chage() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --lastday | --expiredate | --help | --inactive | --mindays | --maxdays | \ diff --git a/completions/change_pw b/completions/change_pw index f32ec7312d5..df301609ced 100644 --- a/completions/change_pw +++ b/completions/change_pw @@ -2,8 +2,8 @@ _change_pw() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -l | --listname) diff --git a/completions/check_db b/completions/check_db index 0064c87e29f..a4af0e5d57c 100644 --- a/completions/check_db +++ b/completions/check_db @@ -2,8 +2,8 @@ _check_db() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--all --verbose --help' -- "$cur")) diff --git a/completions/check_perms b/completions/check_perms index be69fc190e4..829a2b14639 100644 --- a/completions/check_perms +++ b/completions/check_perms @@ -2,8 +2,8 @@ _check_perms() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '-f -v -h' -- "$cur")) diff --git a/completions/checksec b/completions/checksec index 24d576f2bf4..909aedd4a52 100644 --- a/completions/checksec +++ b/completions/checksec @@ -2,8 +2,8 @@ _checksec() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --version | --help) diff --git a/completions/chgrp b/completions/chgrp index bc6c9a00be9..21b3c87547e 100644 --- a/completions/chgrp +++ b/completions/chgrp @@ -2,8 +2,8 @@ _chgrp() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return cur=${cur//\\\\/} diff --git a/completions/chkconfig b/completions/chkconfig index 3fa4435e3a4..939a03d3201 100644 --- a/completions/chkconfig +++ b/completions/chkconfig @@ -2,8 +2,8 @@ _chkconfig() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --level=[1-6] | [1-6] | --list | --add | --del | --override) diff --git a/completions/chmod b/completions/chmod index 8ad0af251c9..967315e67ae 100644 --- a/completions/chmod +++ b/completions/chmod @@ -2,8 +2,8 @@ _chmod() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --version) diff --git a/completions/chown b/completions/chown index 44cd88d7890..d2eec2d777e 100644 --- a/completions/chown +++ b/completions/chown @@ -2,9 +2,9 @@ _chown() { - local cur prev words cword split + local cur prev words cword split comp_args # Don't treat user:group as separate words. - _comp_initialize -s -n : || return + _comp_initialize -s -n : -- "$@" || return case "$prev" in --from) diff --git a/completions/chpasswd b/completions/chpasswd index 5d1ec5ecca3..f2ed8e6429d 100644 --- a/completions/chpasswd +++ b/completions/chpasswd @@ -2,8 +2,8 @@ _chpasswd() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --crypt | -!(-*)c) diff --git a/completions/chromium-browser b/completions/chromium-browser index 2e1508daecb..dc64046025e 100644 --- a/completions/chromium-browser +++ b/completions/chromium-browser @@ -2,8 +2,8 @@ _chromium_browser() { - local cur prev words cword split - _comp_initialize -s -n : || return + local cur prev words cword split comp_args + _comp_initialize -s -n : -- "$@" || return case $prev in --help | --app | --proxy-pac-url | -h) diff --git a/completions/chronyc b/completions/chronyc index 4d8279ff9dd..e2cd2980a06 100644 --- a/completions/chronyc +++ b/completions/chronyc @@ -15,8 +15,8 @@ _chronyc_command_args() _chronyc() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | -*p) diff --git a/completions/chrpath b/completions/chrpath index 5239c3e4ec7..7b1d389a8d4 100644 --- a/completions/chrpath +++ b/completions/chrpath @@ -2,8 +2,8 @@ _chrpath() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --version | --help | -!(-*)[vh]) diff --git a/completions/cksfv b/completions/cksfv index d375343000f..8b5ec53eff9 100644 --- a/completions/cksfv +++ b/completions/cksfv @@ -2,8 +2,8 @@ _cksfv() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if ((cword == 1)); then COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur")) diff --git a/completions/cleanarch b/completions/cleanarch index 19828164480..735027b8fab 100644 --- a/completions/cleanarch +++ b/completions/cleanarch @@ -2,8 +2,8 @@ _cleanarch() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--status --dry-run --quiet --help' \ diff --git a/completions/clisp b/completions/clisp index be2094bded8..1f4c76f42ab 100644 --- a/completions/clisp +++ b/completions/clisp @@ -4,8 +4,8 @@ _clisp() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return # completing an option (may or may not be separated by a space) if [[ $cur == -* ]]; then diff --git a/completions/clone_member b/completions/clone_member index 4c9252239de..1aa674b3b8f 100644 --- a/completions/clone_member +++ b/completions/clone_member @@ -2,8 +2,8 @@ _clone_member() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -l | --listname) diff --git a/completions/complete b/completions/complete index c340c5de07a..e71904670d7 100644 --- a/completions/complete +++ b/completions/complete @@ -2,8 +2,8 @@ _complete() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*o) diff --git a/completions/config_list b/completions/config_list index f29ba779d6c..e367ae968a4 100644 --- a/completions/config_list +++ b/completions/config_list @@ -2,8 +2,8 @@ _config_list() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -i | -o | --inputfile | --outputfile) diff --git a/completions/configure b/completions/configure index 32d2c9ff6ec..96229a87524 100644 --- a/completions/configure +++ b/completions/configure @@ -2,8 +2,8 @@ _configure() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -h | --help | -V | --version | --program-prefix | --program-suffix | \ diff --git a/completions/convert b/completions/convert index d4a780385e6..e38dec12260 100644 --- a/completions/convert +++ b/completions/convert @@ -129,8 +129,8 @@ _ImageMagick() _convert() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return _ImageMagick && return @@ -148,8 +148,8 @@ _convert() _mogrify() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return _ImageMagick && return @@ -166,8 +166,8 @@ _mogrify() _display() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return _ImageMagick && return @@ -184,8 +184,8 @@ _display() _animate() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return _ImageMagick && return @@ -202,8 +202,8 @@ _animate() _identify() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return _ImageMagick && return @@ -219,8 +219,8 @@ _identify() _montage() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return _ImageMagick && return @@ -237,8 +237,8 @@ _montage() _composite() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return _ImageMagick && return @@ -255,8 +255,8 @@ _composite() _compare() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return _ImageMagick && return @@ -272,8 +272,8 @@ _compare() _conjure() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return _ImageMagick && return @@ -289,8 +289,8 @@ _conjure() _import() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return _ImageMagick && return @@ -306,8 +306,8 @@ _import() _stream() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return _ImageMagick && return diff --git a/completions/cowsay b/completions/cowsay index 7a55fb76771..e7bb471179e 100644 --- a/completions/cowsay +++ b/completions/cowsay @@ -2,8 +2,8 @@ _cowsay() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -f) diff --git a/completions/cpan2dist b/completions/cpan2dist index b9b8cf649d1..d82836764ab 100644 --- a/completions/cpan2dist +++ b/completions/cpan2dist @@ -2,8 +2,8 @@ _cpan2dist() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --format) diff --git a/completions/cpio b/completions/cpio index 4280322827c..e1be1f69c59 100644 --- a/completions/cpio +++ b/completions/cpio @@ -2,8 +2,8 @@ _cpio() { - local cur prev words cword split - _comp_initialize -s -n : || return + local cur prev words cword split comp_args + _comp_initialize -s -n : -- "$@" || return # --name value style option case $prev in diff --git a/completions/cppcheck b/completions/cppcheck index 1b80384e765..aadee07763d 100644 --- a/completions/cppcheck +++ b/completions/cppcheck @@ -2,8 +2,8 @@ _cppcheck() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --append | --exitcode-suppressions | --rule-file | --config-excludes-file | \ diff --git a/completions/crontab b/completions/crontab index d12590ad4e3..31811983d6a 100644 --- a/completions/crontab +++ b/completions/crontab @@ -2,8 +2,8 @@ _crontab() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*u) diff --git a/completions/cryptsetup b/completions/cryptsetup index 374ac7e5316..2d574a0192c 100644 --- a/completions/cryptsetup +++ b/completions/cryptsetup @@ -13,8 +13,8 @@ _cryptsetup_device() _cryptsetup() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --version | --cipher | --hash | --*-size | --key-slot | --size | --offset | \ diff --git a/completions/curl b/completions/curl index eb8811ec880..55fca487f6d 100644 --- a/completions/curl +++ b/completions/curl @@ -2,8 +2,8 @@ _curl() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --abstract-unix-socket | --alt-svc | --config | --cookie | \ diff --git a/completions/cvs b/completions/cvs index 11ac5146c06..0d694efa15f 100644 --- a/completions/cvs +++ b/completions/cvs @@ -49,8 +49,8 @@ _comp_deprecate_func _cvs_roots _comp_xfunc_cvs_roots _cvs() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return local count mode i cvsroot cvsroots pwd local -a flags files entries changed newremoved diff --git a/completions/cvsps b/completions/cvsps index ef0003b93c5..8c612d87bfb 100644 --- a/completions/cvsps +++ b/completions/cvsps @@ -2,8 +2,8 @@ _cvsps() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return case $prev in -h | -z | -f | -d | -l | --diff-opts | --debuglvl) diff --git a/completions/dd b/completions/dd index 916d99d18af..be37f19aaef 100644 --- a/completions/dd +++ b/completions/dd @@ -2,8 +2,8 @@ _dd() { - local cur prev words cword - _comp_initialize -n = || return + local cur prev words cword comp_args + _comp_initialize -n = -- "$@" || return case $cur in if=* | of=*) diff --git a/completions/declare b/completions/declare index 1a99324f8dd..9e55c9dceda 100644 --- a/completions/declare +++ b/completions/declare @@ -2,8 +2,8 @@ _comp_cmd_declare() { - local cur prev words cword - _comp_initialize -n := || return + local cur prev words cword comp_args + _comp_initialize -n := -- "$@" || return if [[ $cur == [-+]* ]]; then local opts diff --git a/completions/deja-dup b/completions/deja-dup index c532fc54f28..3d1fe3fabf1 100644 --- a/completions/deja-dup +++ b/completions/deja-dup @@ -2,8 +2,8 @@ _deja_dup() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -'?' | --help | --help-*) diff --git a/completions/desktop-file-validate b/completions/desktop-file-validate index d3c3902734e..e808976ea3a 100644 --- a/completions/desktop-file-validate +++ b/completions/desktop-file-validate @@ -2,8 +2,8 @@ _desktop_file_validate() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help) diff --git a/completions/dhclient b/completions/dhclient index 6e73fe1f89d..996f56b98b8 100644 --- a/completions/dhclient +++ b/completions/dhclient @@ -2,8 +2,8 @@ _dhclient() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -p | -e) diff --git a/completions/dict b/completions/dict index 71ada3f6c59..5f9285e1967 100644 --- a/completions/dict +++ b/completions/dict @@ -8,8 +8,8 @@ _dictdata() _dict() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local host port db i diff --git a/completions/dmypy b/completions/dmypy index 43516c21686..81bc8344f1b 100644 --- a/completions/dmypy +++ b/completions/dmypy @@ -2,8 +2,8 @@ _dmypy() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version | -[hV]) diff --git a/completions/dnssec-keygen b/completions/dnssec-keygen index ae3ac6c675a..6cb176ce7a0 100644 --- a/completions/dnssec-keygen +++ b/completions/dnssec-keygen @@ -11,8 +11,8 @@ _dnssec_keygen_optarg() _dnssec_keygen() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -[hbEgLpsPARIDSi]) diff --git a/completions/dnsspoof b/completions/dnsspoof index 6187b5fbf2a..f407b3347fd 100644 --- a/completions/dnsspoof +++ b/completions/dnsspoof @@ -2,8 +2,8 @@ _dnsspoof() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -i) diff --git a/completions/dot b/completions/dot index d70d191d22e..05f9448d7c4 100644 --- a/completions/dot +++ b/completions/dot @@ -2,8 +2,8 @@ _dot() { - local cur prev words cword - _comp_initialize -n := || return + local cur prev words cword comp_args + _comp_initialize -n := -- "$@" || return [[ $prev == -[V?] ]] && return diff --git a/completions/dpkg b/completions/dpkg index 9062c34fcef..498ef011eb7 100644 --- a/completions/dpkg +++ b/completions/dpkg @@ -37,8 +37,8 @@ _comp_deprecate_func _comp_dpkg_purgeable_packages _comp_xfunc_dpkg_purgeable_pa # _dpkg() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local i=$cword @@ -126,8 +126,8 @@ _dpkg() # _dpkg_reconfigure() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local opt diff --git a/completions/dpkg-source b/completions/dpkg-source index d9225fbd6c6..8df31fdd81c 100644 --- a/completions/dpkg-source +++ b/completions/dpkg-source @@ -2,8 +2,8 @@ _dpkg_source() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local options word action packopts unpackopts fields diff --git a/completions/dselect b/completions/dselect index 660374f451f..45bb99bfbdd 100644 --- a/completions/dselect +++ b/completions/dselect @@ -2,8 +2,8 @@ _dselect() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --admindir) diff --git a/completions/dsniff b/completions/dsniff index 9e01545efef..3919b3ca280 100644 --- a/completions/dsniff +++ b/completions/dsniff @@ -2,8 +2,8 @@ _dsniff() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -r | -w | -f | -p) diff --git a/completions/dumpdb b/completions/dumpdb index 210b7bf450a..850e3767c1a 100644 --- a/completions/dumpdb +++ b/completions/dumpdb @@ -2,8 +2,8 @@ _dumpdb() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--marshal --pickle --noprint --help' \ diff --git a/completions/dumpe2fs b/completions/dumpe2fs index 71c9dbc6681..57d9c646c63 100644 --- a/completions/dumpe2fs +++ b/completions/dumpe2fs @@ -2,8 +2,8 @@ _dumpe2fs() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*[oV]) diff --git a/completions/e2freefrag b/completions/e2freefrag index 8683ec282b2..2031b7039bb 100644 --- a/completions/e2freefrag +++ b/completions/e2freefrag @@ -2,8 +2,8 @@ _e2freefrag() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -c | -h) diff --git a/completions/e2label b/completions/e2label index 2cb66816f35..8e2617745a8 100644 --- a/completions/e2label +++ b/completions/e2label @@ -2,8 +2,8 @@ _e2label() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if ((cword == 1)); then cur=${cur:=/dev/} diff --git a/completions/ebtables b/completions/ebtables index e1a8d1f3779..0c5e3d9ca63 100644 --- a/completions/ebtables +++ b/completions/ebtables @@ -2,8 +2,8 @@ _ebtables() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local table chain='s/^Bridge chain: \([^ ,]\{1,\}\).*$/\1/p' \ targets='ACCEPT DROP CONTINUE RETURN' diff --git a/completions/ecryptfs-migrate-home b/completions/ecryptfs-migrate-home index 0c4cd6e847b..872ae2b24db 100644 --- a/completions/ecryptfs-migrate-home +++ b/completions/ecryptfs-migrate-home @@ -2,8 +2,8 @@ _ecryptfs_migrate_home() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help) diff --git a/completions/eog b/completions/eog index 4611617220a..3e286d4b6c4 100644 --- a/completions/eog +++ b/completions/eog @@ -2,8 +2,8 @@ _eog() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -'?' | --help | --help-all | --help-gtk) diff --git a/completions/ether-wake b/completions/ether-wake index 71ca4372138..da55634c65b 100644 --- a/completions/ether-wake +++ b/completions/ether-wake @@ -2,8 +2,8 @@ _ether_wake() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return case $prev in -i) diff --git a/completions/evince b/completions/evince index d072a3395c7..1102d283821 100644 --- a/completions/evince +++ b/completions/evince @@ -2,8 +2,8 @@ _evince() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help* | --sm-client-id | --class | --name | --screen | --gdk-debug | \ diff --git a/completions/export b/completions/export index a23e87bd351..3c15e9defdd 100644 --- a/completions/export +++ b/completions/export @@ -2,8 +2,8 @@ _export() { - local cur prev words cword - _comp_initialize -n := || return + local cur prev words cword comp_args + _comp_initialize -n := -- "$@" || return local i action=variable remove=false for ((i = 1; i < cword; i++)); do diff --git a/completions/faillog b/completions/faillog index 5d65584828e..a4da7e95ff0 100644 --- a/completions/faillog +++ b/completions/faillog @@ -2,8 +2,8 @@ _faillog() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --lock-time | --maximum | --time | -!(-*)[hlmt]) diff --git a/completions/fbgs b/completions/fbgs index 541004341e6..da7c8240500 100644 --- a/completions/fbgs +++ b/completions/fbgs @@ -2,8 +2,8 @@ _fbgs() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case "$prev" in -f | --font) diff --git a/completions/fbi b/completions/fbi index 039dda34c97..1c54f6ac02d 100644 --- a/completions/fbi +++ b/completions/fbi @@ -2,8 +2,8 @@ _fbi() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case "$prev" in -l | --list) diff --git a/completions/feh b/completions/feh index 3b57194c68f..3e4e479dcac 100644 --- a/completions/feh +++ b/completions/feh @@ -2,8 +2,8 @@ _feh() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case "$prev" in --image-bg | -B) diff --git a/completions/file b/completions/file index ad7aebe9fd4..0f8a95b93a2 100644 --- a/completions/file +++ b/completions/file @@ -2,8 +2,8 @@ _file() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version | --separator | -!(-*)[vF]) diff --git a/completions/file-roller b/completions/file-roller index e6a994d0806..7f3376eaca3 100644 --- a/completions/file-roller +++ b/completions/file-roller @@ -2,8 +2,8 @@ _file_roller() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local exts='@(7z?(.001)|ace|alz|ar|arj|[bglx]z|bz2|tb?(z)2|cab|cb[rz]|iso?(9660)|Z|t[abglx]z|cpio|deb|rar|?(g)tar|gem|lh[az]|lz[4h]|?(t)lrz|lzma|lzo|wim|swm|rpm|sit|zoo)' @@ -16,7 +16,7 @@ _file_roller() return ;; --add-to | -!(-*)a) - _filedir_xspec unzip + _filedir_xspec unzip "${@:2}" _filedir "$exts" return ;; @@ -34,7 +34,7 @@ _file_roller() return fi - _filedir_xspec unzip + _filedir_xspec unzip "${@:2}" _filedir "$exts" } && complete -F _file_roller file-roller diff --git a/completions/filefrag b/completions/filefrag index 5f363e2c2bb..4a3b2df7073 100644 --- a/completions/filefrag +++ b/completions/filefrag @@ -2,8 +2,8 @@ _filefrag() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur")) diff --git a/completions/filesnarf b/completions/filesnarf index d4f179b07b9..665b04a8d69 100644 --- a/completions/filesnarf +++ b/completions/filesnarf @@ -2,8 +2,8 @@ _snarf() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -i) diff --git a/completions/find b/completions/find index 69bc063be5e..b1fc96a4a21 100644 --- a/completions/find +++ b/completions/find @@ -4,8 +4,8 @@ _find() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local i for i in ${!words[*]}; do diff --git a/completions/find_member b/completions/find_member index cc680f61f8b..70f84de4627 100644 --- a/completions/find_member +++ b/completions/find_member @@ -2,8 +2,8 @@ _find_member() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -l | -x | --listname | --exclude) diff --git a/completions/fio b/completions/fio index d49d62d03a4..b0850a254e7 100644 --- a/completions/fio +++ b/completions/fio @@ -9,8 +9,8 @@ _comp_cmd_fio__engines() _fio() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local ret case $prev in diff --git a/completions/firefox b/completions/firefox index fcb89c192cb..787f7344718 100644 --- a/completions/firefox +++ b/completions/firefox @@ -2,8 +2,8 @@ _firefox() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return [[ $cur == -MOZ_LOG*=* ]] && prev=${cur%%=*} cur=${cur#*=} diff --git a/completions/flake8 b/completions/flake8 index 0ac82de13eb..1238add0f02 100644 --- a/completions/flake8 +++ b/completions/flake8 @@ -2,8 +2,8 @@ _flake8() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --version | -!(-*)h) diff --git a/completions/freebsd-update b/completions/freebsd-update index e8a8f06ff0d..ac90d3c6e53 100644 --- a/completions/freebsd-update +++ b/completions/freebsd-update @@ -4,8 +4,8 @@ _freebsd_update() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -b | -d) diff --git a/completions/freeciv b/completions/freeciv index f1998b07846..59950a2c3e2 100644 --- a/completions/freeciv +++ b/completions/freeciv @@ -2,8 +2,8 @@ _freeciv() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version | --name | --port | -[hvnp]) diff --git a/completions/freeciv-server b/completions/freeciv-server index 98d9b627e3a..a98a9e114c4 100644 --- a/completions/freeciv-server +++ b/completions/freeciv-server @@ -2,8 +2,8 @@ _civserver() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -f | -g | -l | -r | --file | --log | --gamelog | --read) diff --git a/completions/function b/completions/function index 2482f931572..3a2afa5c7d2 100644 --- a/completions/function +++ b/completions/function @@ -2,8 +2,8 @@ _function() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if ((cword == 1)); then COMPREPLY=($(compgen -A function -- "$cur")) diff --git a/completions/fusermount b/completions/fusermount index 2890d6c2621..5de08fb047d 100644 --- a/completions/fusermount +++ b/completions/fusermount @@ -2,8 +2,8 @@ _fusermount() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*[hVo]) diff --git a/completions/gcc b/completions/gcc index 3dacd94ab93..9722ea99c75 100644 --- a/completions/gcc +++ b/completions/gcc @@ -2,8 +2,8 @@ _gcc() { - local cur prev prev2 words cword argument prefix prefix_length - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return # Test that GCC is recent enough and if not fallback to # parsing of --completion option. @@ -21,6 +21,7 @@ _gcc() return fi + local prev2 argument prefix prefix_length # extract also for situations like: -fsanitize=add if ((cword > 2)); then prev2="${COMP_WORDS[cword - 2]}" diff --git a/completions/gcl b/completions/gcl index e9e697aa73c..dbd3a293e50 100644 --- a/completions/gcl +++ b/completions/gcl @@ -4,8 +4,8 @@ _gcl() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return # completing an option (may or may not be separated by a space) if [[ $cur == -* ]]; then diff --git a/completions/gdb b/completions/gdb index adc74263973..4e15c26c52d 100644 --- a/completions/gdb +++ b/completions/gdb @@ -2,8 +2,8 @@ _gdb() { - local cur prev words cword i - _comp_initialize || return + local cur prev words cword comp_args i + _comp_initialize -- "$@" || return # gdb [options] --args executable-file [inferior-arguments ...] for ((i = 1; i < cword; i++)); do diff --git a/completions/genaliases b/completions/genaliases index 408db65d131..c34d0fddaf2 100644 --- a/completions/genaliases +++ b/completions/genaliases @@ -2,8 +2,8 @@ _genaliases() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--quiet --help' -- "$cur")) diff --git a/completions/gendiff b/completions/gendiff index cf3a6bab253..ed9fb79f99c 100644 --- a/completions/gendiff +++ b/completions/gendiff @@ -2,8 +2,8 @@ _gendiff() { - local cur prev words cword - _comp_initialize -o '@(diff|patch)' || return + local cur prev words cword comp_args + _comp_initialize -o '@(diff|patch)' -- "$@" || return ((cword == 1)) && _filedir -d } && diff --git a/completions/genisoimage b/completions/genisoimage index 6e0dd45b462..bd37c5b3005 100644 --- a/completions/genisoimage +++ b/completions/genisoimage @@ -2,8 +2,8 @@ _mkisofs() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -o | -abstract | -biblio | -check-session | -copyright | -log-file | \ diff --git a/completions/geoiplookup b/completions/geoiplookup index 9daad394574..b8798d304d5 100644 --- a/completions/geoiplookup +++ b/completions/geoiplookup @@ -2,8 +2,8 @@ _geoiplookup() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h | -'?' | -v) diff --git a/completions/getconf b/completions/getconf index 1c3d18a78b0..eb7886ecaf0 100644 --- a/completions/getconf +++ b/completions/getconf @@ -2,8 +2,8 @@ _getconf() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -a) diff --git a/completions/getent b/completions/getent index 2969c218008..b702411977c 100644 --- a/completions/getent +++ b/completions/getent @@ -2,8 +2,8 @@ _getent() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local i db for ((i = 1; i < cword; i++)); do diff --git a/completions/gkrellm b/completions/gkrellm index df393c4d18a..478d3d2347c 100644 --- a/completions/gkrellm +++ b/completions/gkrellm @@ -2,8 +2,8 @@ _gkrellm() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -t | --theme) diff --git a/completions/gm b/completions/gm index a0611847287..8aa9abe8ecf 100644 --- a/completions/gm +++ b/completions/gm @@ -8,8 +8,8 @@ _gm_commands() _gm() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if ((cword == 1)); then _gm_commands "$1" diff --git a/completions/gnatmake b/completions/gnatmake index 1d65528d9dd..087c6e52905 100644 --- a/completions/gnatmake +++ b/completions/gnatmake @@ -3,8 +3,8 @@ _gnatmake() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then # relevant (and less relevant ;-) )options completion diff --git a/completions/gnokii b/completions/gnokii index 37fb64aec81..ced8210cfff 100644 --- a/completions/gnokii +++ b/completions/gnokii @@ -8,8 +8,8 @@ _gnokii_memory_type() _gnokii() { - local cur prev words cword pprev tprev fprev - _comp_initialize || return + local cur prev words cword comp_args pprev tprev fprev + _comp_initialize -- "$@" || return case $prev in --config) diff --git a/completions/gnome-mplayer b/completions/gnome-mplayer index c95b91994bf..b8bc9457f1c 100644 --- a/completions/gnome-mplayer +++ b/completions/gnome-mplayer @@ -2,8 +2,8 @@ _gnome_mplayer() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -'?' | --help | --help-all | --help-gtk) diff --git a/completions/gnome-screenshot b/completions/gnome-screenshot index 99c706eaa52..9b648d17a8d 100644 --- a/completions/gnome-screenshot +++ b/completions/gnome-screenshot @@ -2,8 +2,8 @@ _gnome_screenshot() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --help-* | --version | --delay | --display | -!(-*)[hd]) diff --git a/completions/gpasswd b/completions/gpasswd index 7ba14bda663..a2f6d6fb2d2 100644 --- a/completions/gpasswd +++ b/completions/gpasswd @@ -2,8 +2,8 @@ _gpasswd() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --add | --delete | --administrators | --members | -!(-*)[adAM]) diff --git a/completions/gpg b/completions/gpg index cbce5146e57..da7eaaf0f72 100644 --- a/completions/gpg +++ b/completions/gpg @@ -2,8 +2,8 @@ _gpg() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --sign | --clearsign | --decrypt-files | --load-extension | -!(-*)s) diff --git a/completions/gpg2 b/completions/gpg2 index 1de46a63a5d..b3515b7c83b 100644 --- a/completions/gpg2 +++ b/completions/gpg2 @@ -2,8 +2,8 @@ _gpg2() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --homedir) diff --git a/completions/gpgv b/completions/gpgv index 562fbcb49a7..336f3e618c9 100644 --- a/completions/gpgv +++ b/completions/gpgv @@ -2,8 +2,8 @@ _gpgv() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version | --weak-digest | --*-fd | -!(-*)[?h]*) diff --git a/completions/gphoto2 b/completions/gphoto2 index 59f9863adcf..a634b7cd55c 100644 --- a/completions/gphoto2 +++ b/completions/gphoto2 @@ -2,8 +2,8 @@ _gphoto2() { - local cur prev words cword split - _comp_initialize -s -n : || return + local cur prev words cword split comp_args + _comp_initialize -s -n : -- "$@" || return case $prev in --debug-logfile) diff --git a/completions/gprof b/completions/gprof index 0ba425c1841..82ae5f5aea4 100644 --- a/completions/gprof +++ b/completions/gprof @@ -2,8 +2,8 @@ _gprof() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $cur in -A* | -C* | -J* | -p* | -P* | -q* | -Q* | -n* | -N* | -d*) diff --git a/completions/groupadd b/completions/groupadd index 078b913702a..ab64c04c1ca 100644 --- a/completions/groupadd +++ b/completions/groupadd @@ -2,8 +2,8 @@ _groupadd() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return # TODO: if -o/--non-unique is given, could complete on existing gids # with -g/--gid diff --git a/completions/groupdel b/completions/groupdel index 5ca48faea27..754262e49c4 100644 --- a/completions/groupdel +++ b/completions/groupdel @@ -2,8 +2,8 @@ _groupdel() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h | --help) diff --git a/completions/groupmems b/completions/groupmems index 9011266196d..fed533c5e44 100644 --- a/completions/groupmems +++ b/completions/groupmems @@ -2,8 +2,8 @@ _groupmems() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -a | --add | -d | --delete) diff --git a/completions/groupmod b/completions/groupmod index 901ddc0807a..bc8b6225bdc 100644 --- a/completions/groupmod +++ b/completions/groupmod @@ -2,8 +2,8 @@ _groupmod() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return # TODO: if -o/--non-unique is given, could complete on existing gids # with -g/--gid diff --git a/completions/growisofs b/completions/growisofs index 9b237275f0f..601f50c47cb 100644 --- a/completions/growisofs +++ b/completions/growisofs @@ -2,8 +2,8 @@ _growisofs() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -version | -speed) diff --git a/completions/grpck b/completions/grpck index 71e83c46236..b354123cd4f 100644 --- a/completions/grpck +++ b/completions/grpck @@ -2,8 +2,8 @@ _grpck() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --root | -!(-*)R) diff --git a/completions/gssdp-discover b/completions/gssdp-discover index 1648817057c..21cb94e310c 100644 --- a/completions/gssdp-discover +++ b/completions/gssdp-discover @@ -2,8 +2,8 @@ _gssdp_discover() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --target | --timeout | --rescan-interval | -[htnr]) diff --git a/completions/gzip b/completions/gzip index a2882571d2b..8d96a3e8ad1 100644 --- a/completions/gzip +++ b/completions/gzip @@ -2,8 +2,8 @@ _gzip() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --blocksize | --suffix | --help | --version | --alias | --comment | \ diff --git a/completions/hcitool b/completions/hcitool index 72ddaa743dd..8c040c140e0 100644 --- a/completions/hcitool +++ b/completions/hcitool @@ -29,8 +29,8 @@ _bluetooth_packet_types() _hcitool() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -i) @@ -109,8 +109,8 @@ _hcitool() _sdptool() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --bdaddr) @@ -167,8 +167,8 @@ _sdptool() _l2ping() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -i) @@ -190,8 +190,8 @@ _l2ping() _rfcomm() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -f | --config) @@ -234,8 +234,8 @@ _rfcomm() _ciptool() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -i) @@ -270,8 +270,8 @@ _ciptool() _dfutool() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -d | --device) @@ -300,8 +300,8 @@ _dfutool() _hciconfig() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local arg _get_first_arg @@ -344,8 +344,8 @@ _hciconfig() _hciattach() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '-n -p -t -b -s -l' -- "$cur")) diff --git a/completions/hddtemp b/completions/hddtemp index 8a927f70475..7a6b58218b1 100644 --- a/completions/hddtemp +++ b/completions/hddtemp @@ -2,8 +2,8 @@ _hddtemp() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --file | -!(-*)f) diff --git a/completions/hid2hci b/completions/hid2hci index b24a5604141..ff8e010bde2 100644 --- a/completions/hid2hci +++ b/completions/hid2hci @@ -2,8 +2,8 @@ _hid2hci() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--help --quiet -0 --tohci -1 --tohid' \ diff --git a/completions/hostname b/completions/hostname index 0cdc28c7a2b..1c590aafdd2 100644 --- a/completions/hostname +++ b/completions/hostname @@ -2,8 +2,8 @@ _hostname() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version | -!(-*)[hV]) diff --git a/completions/hping2 b/completions/hping2 index 55871bbbf50..d9635d4a1ac 100644 --- a/completions/hping2 +++ b/completions/hping2 @@ -2,8 +2,8 @@ _hping2() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --interface | -!(-*)I) diff --git a/completions/htop b/completions/htop index b9f317401ea..273e22de807 100644 --- a/completions/htop +++ b/completions/htop @@ -2,8 +2,8 @@ _htop() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case "$prev" in --sort-key | -!(-*)s) diff --git a/completions/htpasswd b/completions/htpasswd index 1b9427eeec2..d8921fe05c4 100644 --- a/completions/htpasswd +++ b/completions/htpasswd @@ -2,8 +2,8 @@ _htpasswd() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local i o=0 # $o is index of first non-option argument for ((i = 1; i <= cword; i++)); do diff --git a/completions/hunspell b/completions/hunspell index 0b688af3e74..d49de68a2c8 100644 --- a/completions/hunspell +++ b/completions/hunspell @@ -2,8 +2,8 @@ _hunspell() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version | -vv | -[hPv]) diff --git a/completions/iconv b/completions/iconv index 8846bc062a2..c7578376124 100644 --- a/completions/iconv +++ b/completions/iconv @@ -10,8 +10,8 @@ _comp_deprecate_func _iconv_charsets _comp_xfunc_iconv_charsets _iconv() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --usage | --version | --unicode-subst | --byte-subst | \ diff --git a/completions/id b/completions/id index af6678ad422..e62e3e08e57 100644 --- a/completions/id +++ b/completions/id @@ -2,8 +2,8 @@ _id() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then local opts=$(_parse_help "$1") diff --git a/completions/idn b/completions/idn index 1e3ac0c1709..ee0f74ae4f4 100644 --- a/completions/idn +++ b/completions/idn @@ -2,8 +2,8 @@ _idn() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --version | -!(-*)[hV]) diff --git a/completions/ifstat b/completions/ifstat index 0c78a92bcd9..a5b06e80460 100644 --- a/completions/ifstat +++ b/completions/ifstat @@ -2,8 +2,8 @@ _ifstat() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --version | --scan | --interval | -!(-*)[hvV]) diff --git a/completions/iftop b/completions/iftop index 890fd34b45a..7a8a880b147 100644 --- a/completions/iftop +++ b/completions/iftop @@ -2,8 +2,8 @@ _iftop() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h | -f | -F | -m) diff --git a/completions/ifup b/completions/ifup index acda79a7731..656812e0e60 100644 --- a/completions/ifup +++ b/completions/ifup @@ -4,8 +4,8 @@ _comp_userland GNU || return 1 _ifupdown() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version | --allow | --exclude | --option | -!(-*)[hVXo]) diff --git a/completions/influx b/completions/influx index b4a39ee13d3..6d3054f1b34 100644 --- a/completions/influx +++ b/completions/influx @@ -2,8 +2,8 @@ _influx() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -version | -port | -database | -password | -username | -execute | -pps) diff --git a/completions/info b/completions/info index 80111389f21..efc297da94e 100644 --- a/completions/info +++ b/completions/info @@ -2,8 +2,8 @@ _info() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return # default completion if parameter looks like a path if [[ $cur == @(*/|[.~])* ]]; then diff --git a/completions/inject b/completions/inject index c78178d601a..9dce9ee4125 100644 --- a/completions/inject +++ b/completions/inject @@ -2,8 +2,8 @@ _inject() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -l | --listname) diff --git a/completions/inotifywait b/completions/inotifywait index 812807a4f94..abcd463b6a9 100644 --- a/completions/inotifywait +++ b/completions/inotifywait @@ -13,8 +13,8 @@ _inotifywait_events() _inotifywait() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --exclude | --excludei | --format | --timefmt | --timeout | -!(-*)[ht]) diff --git a/completions/insmod b/completions/insmod index 5b784cbc7bd..16cc1d1ffbd 100644 --- a/completions/insmod +++ b/completions/insmod @@ -2,8 +2,8 @@ _insmod() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return # do filename completion for first argument if ((cword == 1)); then diff --git a/completions/installpkg b/completions/installpkg index c55e5bddf55..8991494dfc4 100644 --- a/completions/installpkg +++ b/completions/installpkg @@ -2,8 +2,8 @@ _installpkg() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case "$prev" in --root) diff --git a/completions/interdiff b/completions/interdiff index 0ab11ad65f0..5994542c89d 100644 --- a/completions/interdiff +++ b/completions/interdiff @@ -2,8 +2,8 @@ _interdiff() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --unified | --strip-match | --drop-context | -!(-*)[Upd]) diff --git a/completions/invoke-rc.d b/completions/invoke-rc.d index 3a6dfbf7250..a023d7a0ca6 100644 --- a/completions/invoke-rc.d +++ b/completions/invoke-rc.d @@ -4,8 +4,8 @@ _invoke_rc_d() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local sysvdir services options valid_options diff --git a/completions/ip b/completions/ip index 209a0e290a6..f4d350b11c9 100644 --- a/completions/ip +++ b/completions/ip @@ -9,8 +9,8 @@ _iproute2_etc() _ip() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -V | -Version | -rc | -rcvbuf) diff --git a/completions/ipcalc b/completions/ipcalc index ed65fb8ae32..6325b43eb3b 100644 --- a/completions/ipcalc +++ b/completions/ipcalc @@ -2,8 +2,8 @@ _ipcalc() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version | --split | -[hs]) diff --git a/completions/iperf b/completions/iperf index 9017325bc07..701b9f4d872 100644 --- a/completions/iperf +++ b/completions/iperf @@ -2,8 +2,8 @@ _iperf() { - local cur prev words cword split - _comp_initialize -s -n : || return + local cur prev words cword split comp_args + _comp_initialize -s -n : -- "$@" || return case $prev in --help | --version | --interval | --len | --port | --window | --mss | --bandwidth | \ diff --git a/completions/ipmitool b/completions/ipmitool index 9cf32fd23d8..d31de5e9abd 100644 --- a/completions/ipmitool +++ b/completions/ipmitool @@ -8,8 +8,8 @@ _ipmitool_singleline_help() _ipmitool() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*[hVpUekyPmbtBTl]) diff --git a/completions/ipsec b/completions/ipsec index 179b61b76c2..cbafd79222f 100644 --- a/completions/ipsec +++ b/completions/ipsec @@ -16,8 +16,8 @@ _ipsec_connections() _ipsec_freeswan() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if ((cword == 1)); then COMPREPLY=($(compgen -W 'auto barf eroute klipsdebug look manual @@ -49,8 +49,8 @@ _ipsec_freeswan() _ipsec_strongswan() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if ((cword == 1)); then COMPREPLY=($(compgen -W 'down irdumm leases listaacerts listacerts diff --git a/completions/iptables b/completions/iptables index 339cecf438b..3273793102d 100644 --- a/completions/iptables +++ b/completions/iptables @@ -2,8 +2,8 @@ _iptables() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local table chain='s/^Chain \([^ ]\{1,\}\).*$/\1/p' diff --git a/completions/ipv6calc b/completions/ipv6calc index c6565901f86..644c79e5791 100644 --- a/completions/ipv6calc +++ b/completions/ipv6calc @@ -2,8 +2,8 @@ _ipv6calc() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case "$prev" in --debug | -!(-*)d) diff --git a/completions/iscsiadm b/completions/iscsiadm index b3399bc387b..fa2ac3313b3 100644 --- a/completions/iscsiadm +++ b/completions/iscsiadm @@ -2,8 +2,8 @@ _iscsiadm() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --mode | -!(-*)m) diff --git a/completions/isort b/completions/isort index 5dc052ec76e..23089135bb6 100644 --- a/completions/isort +++ b/completions/isort @@ -2,8 +2,8 @@ _isort() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --add-import | --builtin | --future | --from-first | -ff | \ diff --git a/completions/isql b/completions/isql index d49f3f530ac..2d3a2741647 100644 --- a/completions/isql +++ b/completions/isql @@ -3,8 +3,8 @@ _isql() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return [[ -f $ODBCINI ]] && COMPREPLY=($(command grep "\[$cur" "$ODBCINI" | tr -d \[\])) diff --git a/completions/iwconfig b/completions/iwconfig index 983cd6c0571..12d19ee3243 100644 --- a/completions/iwconfig +++ b/completions/iwconfig @@ -2,8 +2,8 @@ _iwconfig() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in mode) diff --git a/completions/iwlist b/completions/iwlist index 08359219cf7..65fdb6e4281 100644 --- a/completions/iwlist +++ b/completions/iwlist @@ -2,8 +2,8 @@ _iwlist() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if ((cword == 1)); then if [[ $cur == -* ]]; then diff --git a/completions/iwpriv b/completions/iwpriv index cb13cbcb961..67ae2887156 100644 --- a/completions/iwpriv +++ b/completions/iwpriv @@ -2,8 +2,8 @@ _iwpriv() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in roam) diff --git a/completions/iwspy b/completions/iwspy index 5cd6bca61e2..78b771ab3eb 100644 --- a/completions/iwspy +++ b/completions/iwspy @@ -2,8 +2,8 @@ _iwspy() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if ((cword == 1)); then if [[ $cur == -* ]]; then diff --git a/completions/jar b/completions/jar index 3d5b3fc176c..e3aeb347c15 100644 --- a/completions/jar +++ b/completions/jar @@ -2,8 +2,8 @@ _jar() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if ((cword == 1)); then COMPREPLY=($(compgen -W 'c t x u' -- "$cur")) @@ -15,7 +15,7 @@ _jar() _filedir ;; *f) - _filedir_xspec unzip + _filedir_xspec unzip "${@:2}" ;; *) _filedir diff --git a/completions/jarsigner b/completions/jarsigner index a94bd842ba5..bef320703fe 100644 --- a/completions/jarsigner +++ b/completions/jarsigner @@ -2,8 +2,8 @@ _jarsigner() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -keystore) diff --git a/completions/java b/completions/java index 9806324d8c5..750a94668e9 100644 --- a/completions/java +++ b/completions/java @@ -127,8 +127,8 @@ _java_packages() # _java() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return local i @@ -241,8 +241,8 @@ _java() _javadoc() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -overview | -helpfile) @@ -288,8 +288,8 @@ _javadoc() _javac() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return case $prev in -d) diff --git a/completions/javaws b/completions/javaws index 3e979453afe..0ce6f12a088 100644 --- a/completions/javaws +++ b/completions/javaws @@ -2,8 +2,8 @@ _javaws() { - local cur prev words cword - _comp_initialize -n = || return + local cur prev words cword comp_args + _comp_initialize -n = -- "$@" || return case $prev in -help | -license | -about | -viewer | -arg | -param | -property | -update | -umask) diff --git a/completions/jpegoptim b/completions/jpegoptim index 0b8e9923a2e..1dac9671c75 100644 --- a/completions/jpegoptim +++ b/completions/jpegoptim @@ -2,8 +2,8 @@ _jpegoptim() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --version | -!(-*)[hV]*) diff --git a/completions/jps b/completions/jps index 83119dda9e5..1b2f779a3da 100644 --- a/completions/jps +++ b/completions/jps @@ -2,8 +2,8 @@ _jps() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -J* | -help) diff --git a/completions/jq b/completions/jq index c8c1d9dc81a..22cfa76336b 100644 --- a/completions/jq +++ b/completions/jq @@ -2,8 +2,8 @@ _jq() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version | --arg | --argjson | --slurpfile | --argfile) diff --git a/completions/jshint b/completions/jshint index cb9c8e719ac..53ad9ab626f 100644 --- a/completions/jshint +++ b/completions/jshint @@ -2,8 +2,8 @@ _jshint() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -v | --version | -h | --help | --exclude | --filename | -e | --extra-ext) diff --git a/completions/json_xs b/completions/json_xs index ee7c6290827..05db4e00fb9 100644 --- a/completions/json_xs +++ b/completions/json_xs @@ -2,8 +2,8 @@ _json_xs() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*f) diff --git a/completions/jsonschema b/completions/jsonschema index dec7cfc7dbd..01d0364cc27 100644 --- a/completions/jsonschema +++ b/completions/jsonschema @@ -2,8 +2,8 @@ _jsonschema() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --error-format | --validator | -[hFV]) diff --git a/completions/k3b b/completions/k3b index f202de05ac9..ed90842b6fc 100644 --- a/completions/k3b +++ b/completions/k3b @@ -2,8 +2,8 @@ _k3b() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help* | --author | -v | --version | --license | --lang) diff --git a/completions/kcov b/completions/kcov index e50b0b45ac1..96f316497e9 100644 --- a/completions/kcov +++ b/completions/kcov @@ -2,8 +2,8 @@ _kcov() { - local cur prev words cword split - _comp_initialize -s -n : || return + local cur prev words cword split comp_args + _comp_initialize -s -n : -- "$@" || return case "$prev" in --pid | -p) diff --git a/completions/kill b/completions/kill index 13390f7a84a..74082dd5c06 100644 --- a/completions/kill +++ b/completions/kill @@ -2,8 +2,8 @@ _kill() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -s) diff --git a/completions/killall b/completions/killall index a8cf2dbf2ef..839d5b3d627 100644 --- a/completions/killall +++ b/completions/killall @@ -4,8 +4,8 @@ _killall() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --context | --older-than | --younger-than | --version | -!(-*)@([Zoy]|V*)) diff --git a/completions/kldload b/completions/kldload index 9307a475788..eaf2a4f3760 100644 --- a/completions/kldload +++ b/completions/kldload @@ -4,8 +4,8 @@ _kldload() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if _comp_looks_like_path "$cur"; then _filedir ko diff --git a/completions/kldunload b/completions/kldunload index 4d0ec37f8f1..8869f335860 100644 --- a/completions/kldunload +++ b/completions/kldunload @@ -4,8 +4,8 @@ _kldunload() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return COMPREPLY=($(compgen -W '$(kldstat)' -X 'kernel' -X '!*.ko' -- "$cur")) COMPREPLY=(${COMPREPLY[@]%.ko}) diff --git a/completions/koji b/completions/koji index 151149d9331..0c22c642ef5 100644 --- a/completions/koji +++ b/completions/koji @@ -34,8 +34,8 @@ _koji_target() _koji() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local commandix command for ((commandix = 1; commandix < cword; commandix++)); do diff --git a/completions/ktutil b/completions/ktutil index 80505775dd9..19a0b2eaa6f 100644 --- a/completions/ktutil +++ b/completions/ktutil @@ -21,8 +21,8 @@ _heimdal_encodings() _ktutil() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local command commands i options diff --git a/completions/larch b/completions/larch index 108addf1096..34298cc0fd3 100644 --- a/completions/larch +++ b/completions/larch @@ -3,8 +3,8 @@ _larch() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cword -eq 1 || $prev == -* ]]; then COMPREPLY=($(compgen -W ' \ diff --git a/completions/lastlog b/completions/lastlog index a0ed48b13e3..9c86e76f8b6 100644 --- a/completions/lastlog +++ b/completions/lastlog @@ -2,8 +2,8 @@ _lastlog() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --before | --help | --time | -!(-*)@([bt]|h*)) diff --git a/completions/ldapsearch b/completions/ldapsearch index 3cc9b30bc4c..54261535620 100644 --- a/completions/ldapsearch +++ b/completions/ldapsearch @@ -12,8 +12,8 @@ _ldap_protocols() _ldapsearch() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*h) @@ -54,8 +54,8 @@ _ldapsearch() _ldapaddmodify() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*h) @@ -84,8 +84,8 @@ _ldapaddmodify() _ldapdelete() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*h) @@ -114,8 +114,8 @@ _ldapdelete() _ldapcompare() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*h) @@ -144,8 +144,8 @@ _ldapcompare() _ldapmodrdn() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*h) @@ -174,8 +174,8 @@ _ldapmodrdn() _ldapwhoami() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*h) @@ -204,8 +204,8 @@ _ldapwhoami() _ldappasswd() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*h) diff --git a/completions/ldapvi b/completions/ldapvi index a984b543d8b..efd02ae5708 100644 --- a/completions/ldapvi +++ b/completions/ldapvi @@ -2,8 +2,8 @@ _ldapvi() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --host | -!(-*)h) diff --git a/completions/lftp b/completions/lftp index 81ccb507ccf..1e4fdee27ef 100644 --- a/completions/lftp +++ b/completions/lftp @@ -2,8 +2,8 @@ _lftp() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -!(-*)f) diff --git a/completions/lftpget b/completions/lftpget index 556bcc892ca..2ea64eb2d01 100644 --- a/completions/lftpget +++ b/completions/lftpget @@ -2,8 +2,8 @@ _lftpget() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '-c -d -v' -- "$cur")) diff --git a/completions/lilo b/completions/lilo index 60a47445c4d..276e2a213dc 100644 --- a/completions/lilo +++ b/completions/lilo @@ -9,8 +9,8 @@ _lilo_labels() _lilo() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -C | -i | -m | -s | -S) diff --git a/completions/links b/completions/links index 8f414ad39eb..cd0a315c8dc 100644 --- a/completions/links +++ b/completions/links @@ -2,8 +2,8 @@ _links() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return case $prev in -html-t-text-color | -html-t-link-color) diff --git a/completions/lintian b/completions/lintian index eada9005834..5e510910ad9 100644 --- a/completions/lintian +++ b/completions/lintian @@ -73,8 +73,8 @@ _lintian_infos() _lintian() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local lint_actions general_opts behaviour_opts configuration_opts @@ -150,8 +150,8 @@ _lintian() _lintian_info() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case "$prev" in --help | --profile) diff --git a/completions/lisp b/completions/lisp index 0904f84d96f..0641188f3ad 100644 --- a/completions/lisp +++ b/completions/lisp @@ -4,8 +4,8 @@ _lisp() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return # completing an option (may or may not be separated by a space) if [[ $cur == -* ]]; then diff --git a/completions/list_admins b/completions/list_admins index 236bdd52095..1e57486ef1e 100644 --- a/completions/list_admins +++ b/completions/list_admins @@ -2,8 +2,8 @@ _list_admins() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--all-vhost --all --help' -- "$cur")) diff --git a/completions/list_lists b/completions/list_lists index 4de5dd81080..6583eec30a9 100644 --- a/completions/list_lists +++ b/completions/list_lists @@ -9,8 +9,8 @@ _comp_deprecate_func _mailman_lists _comp_xfunc_list_lists_mailman_lists _list_lists() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--advertised --virtual-host-overview --bare diff --git a/completions/list_members b/completions/list_members index 67b20b5f3d0..3043695dce8 100644 --- a/completions/list_members +++ b/completions/list_members @@ -2,8 +2,8 @@ _list_members() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -o | --output) diff --git a/completions/list_owners b/completions/list_owners index 264b3ee60cd..d9bb19a12ea 100644 --- a/completions/list_owners +++ b/completions/list_owners @@ -2,8 +2,8 @@ _list_owners() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--with-listnames --moderators --help' \ diff --git a/completions/locale-gen b/completions/locale-gen index bec5c2baa5c..161f2665af4 100644 --- a/completions/locale-gen +++ b/completions/locale-gen @@ -2,8 +2,8 @@ _locale_gen() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | -h) diff --git a/completions/lpq b/completions/lpq index 7e1c4a8e611..7353e7b4914 100644 --- a/completions/lpq +++ b/completions/lpq @@ -2,8 +2,8 @@ _lpq() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -P) diff --git a/completions/lpr b/completions/lpr index 463a714fd65..60357c486d6 100644 --- a/completions/lpr +++ b/completions/lpr @@ -2,8 +2,8 @@ _lpr() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -P) diff --git a/completions/lrzip b/completions/lrzip index c1d51b6140f..23d41d7cfc0 100644 --- a/completions/lrzip +++ b/completions/lrzip @@ -2,8 +2,8 @@ _lrzip() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local xspec="*.lrz" diff --git a/completions/lsof b/completions/lsof index e8ff5a92db0..c1ae445cc66 100644 --- a/completions/lsof +++ b/completions/lsof @@ -2,8 +2,8 @@ _lsof() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -'?' | -h | +c | -c | -d | -F | -i | +r | -r | -s | -S | -T) diff --git a/completions/lspci b/completions/lspci index d153a3d4002..46c79f2e291 100644 --- a/completions/lspci +++ b/completions/lspci @@ -2,8 +2,8 @@ _lspci() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*[sDO]) diff --git a/completions/lsscsi b/completions/lsscsi index 5f6d39fa595..09f09ad77d4 100644 --- a/completions/lsscsi +++ b/completions/lsscsi @@ -2,8 +2,8 @@ _lsscsi() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --version | -!(-*)[hV]*) diff --git a/completions/lsusb b/completions/lsusb index 4803ed13e95..212a1894eb9 100644 --- a/completions/lsusb +++ b/completions/lsusb @@ -2,8 +2,8 @@ _lsusb() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version | -!(-*)@([sD]|[hV]*)) diff --git a/completions/lua b/completions/lua index f1abad017d9..af90e19efba 100644 --- a/completions/lua +++ b/completions/lua @@ -2,8 +2,8 @@ _lua() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -e | -l | -v | -) diff --git a/completions/luac b/completions/luac index 4ad2a210aa7..bdc7235fffb 100644 --- a/completions/luac +++ b/completions/luac @@ -2,8 +2,8 @@ _luac() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -v | -) diff --git a/completions/luseradd b/completions/luseradd index 575a00dec0a..107d1864ec4 100644 --- a/completions/luseradd +++ b/completions/luseradd @@ -2,8 +2,8 @@ _luseradd() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --usage | --gecos | --uid | --login | --plainpassword | --password | \ diff --git a/completions/luserdel b/completions/luserdel index 68c3bf8d460..09d17e2b7ac 100644 --- a/completions/luserdel +++ b/completions/luserdel @@ -2,8 +2,8 @@ _luserdel() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --usage | -!(-*)[?]*) diff --git a/completions/lvm b/completions/lvm index 6c06acc8b2e..afcb9fd6915 100644 --- a/completions/lvm +++ b/completions/lvm @@ -67,8 +67,8 @@ _lvm_count_args() _lvmdiskscan() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -78,8 +78,8 @@ _lvmdiskscan() _pvscan() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -89,8 +89,8 @@ _pvscan() _pvs() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --options | --sort | -!(-*)[oO]) @@ -114,8 +114,8 @@ _pvs() _pvdisplay() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --units) @@ -134,8 +134,8 @@ _pvdisplay() _pvchange() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --autobackup | --allocatable | -!(-*)[Ax]) @@ -154,8 +154,8 @@ _pvchange() _pvcreate() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --restorefile) @@ -186,8 +186,8 @@ _pvcreate() _pvmove() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --autobackup | -!(-*)A) @@ -210,8 +210,8 @@ _pvmove() _pvremove() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -223,8 +223,8 @@ _pvremove() _vgscan() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -234,8 +234,8 @@ _vgscan() _vgs() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --options | --sort | -!(-*)[oO]) @@ -261,8 +261,8 @@ _vgs() _vgdisplay() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --units) @@ -281,8 +281,8 @@ _vgdisplay() _vgchange() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --available | --autobackup | --resizeable | -!(-*)[aAx]) @@ -301,8 +301,8 @@ _vgchange() _vgcreate() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --autobackup | -!(-*)A) @@ -335,8 +335,8 @@ _vgcreate() _vgremove() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -348,8 +348,8 @@ _vgremove() _vgrename() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --autobackup | -!(-*)A) @@ -368,8 +368,8 @@ _vgrename() _vgreduce() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --autobackup | -!(-*)A) @@ -395,8 +395,8 @@ _vgreduce() _vgextend() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --autobackup | -!(-*)A) @@ -425,8 +425,8 @@ _vgextend() _vgport() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -438,8 +438,8 @@ _vgport() _vgck() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -451,8 +451,8 @@ _vgck() _vgconvert() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --metadatatype | -!(-*)M) @@ -479,8 +479,8 @@ _vgconvert() _vgcfgbackup() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --file | -!(-*)f) @@ -499,8 +499,8 @@ _vgcfgbackup() _vgcfgrestore() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --file | -!(-*)f) @@ -527,8 +527,8 @@ _vgcfgrestore() _vgmerge() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --autobackup | -!(-*)A) @@ -547,8 +547,8 @@ _vgmerge() _vgsplit() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --autobackup | -!(-*)A) @@ -577,8 +577,8 @@ _vgsplit() _vgmknodes() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -590,8 +590,8 @@ _vgmknodes() _lvscan() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) @@ -601,8 +601,8 @@ _lvscan() _lvs() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --options | --sort | -!(-*)[oO]) @@ -627,8 +627,8 @@ _lvs() _lvdisplay() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --units) @@ -647,8 +647,8 @@ _lvdisplay() _lvchange() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM]) @@ -671,8 +671,8 @@ _lvchange() _lvcreate() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ]) @@ -709,8 +709,8 @@ _lvcreate() _lvremove() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --autobackup | -!(-*)A) @@ -729,8 +729,8 @@ _lvremove() _lvrename() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --autobackup | -!(-*)A) @@ -749,8 +749,8 @@ _lvrename() _lvreduce() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --autobackup | -!(-*)A) @@ -773,8 +773,8 @@ _lvreduce() _lvresize() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --autobackup | -!(-*)A) @@ -803,8 +803,8 @@ _lvresize() _lvextend() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --autobackup | -!(-*)A) @@ -833,8 +833,8 @@ _lvextend() _lvm() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if ((cword == 1)); then COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay diff --git a/completions/lz4 b/completions/lz4 index 51e4ff3a882..f109e1e9c99 100644 --- a/completions/lz4 +++ b/completions/lz4 @@ -2,8 +2,8 @@ _lz4() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -b) diff --git a/completions/lzip b/completions/lzip index 42bfb310dc2..ad08a03bc7f 100644 --- a/completions/lzip +++ b/completions/lzip @@ -2,8 +2,8 @@ _lzip() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local decompress=false diff --git a/completions/lzma b/completions/lzma index dc100144707..af9691c52f1 100644 --- a/completions/lzma +++ b/completions/lzma @@ -3,8 +3,8 @@ _lzma() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return $split && return diff --git a/completions/lzop b/completions/lzop index 6debaa83b89..b1d771fb721 100644 --- a/completions/lzop +++ b/completions/lzop @@ -2,8 +2,8 @@ _lzop() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --output | -!(-*)o) diff --git a/completions/macof b/completions/macof index 0cfdb25bf84..3a11fa34fb9 100644 --- a/completions/macof +++ b/completions/macof @@ -2,8 +2,8 @@ _macof() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -i) diff --git a/completions/mailmanctl b/completions/mailmanctl index 5d96b3c60c2..f477df20e39 100644 --- a/completions/mailmanctl +++ b/completions/mailmanctl @@ -2,8 +2,8 @@ _mailmanctl() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--no-restart --run-as-user diff --git a/completions/make b/completions/make index c7fcb0c1a67..c31a8ca0859 100644 --- a/completions/make +++ b/completions/make @@ -89,8 +89,8 @@ EOF _make() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local makef makef_dir=("-C" ".") i diff --git a/completions/makepkg b/completions/makepkg index 622d77a03de..39a3b71027c 100644 --- a/completions/makepkg +++ b/completions/makepkg @@ -3,8 +3,8 @@ # Slackware Linux variant _makepkg_slackware() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case "$prev" in -l | --linkadd | -c | --chown) @@ -41,7 +41,7 @@ _makepkg_bootstrap() unset -f _makepkg_bootstrap complete -F $fname makepkg - $fname + $fname "$@" } && complete -F _makepkg_bootstrap makepkg diff --git a/completions/man b/completions/man index 732fb1978d2..0f90d2337d1 100644 --- a/completions/man +++ b/completions/man @@ -2,8 +2,8 @@ _man() { - local cur prev words cword split - _comp_initialize -s -n : || return + local cur prev words cword split comp_args + _comp_initialize -s -n : -- "$@" || return local comprsuffix=".@([glx]z|bz2|lzma|Z|zst)" local manext="@([0-9]*([a-z])|[lnp]|man)?($comprsuffix)" diff --git a/completions/mc b/completions/mc index b7c3615fd02..04b55dc315c 100644 --- a/completions/mc +++ b/completions/mc @@ -2,8 +2,8 @@ _mc() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --edit | --view | --ftplog | --printwd | -!(-*)[evlP]) diff --git a/completions/mcrypt b/completions/mcrypt index e65b8667ae0..42646691113 100644 --- a/completions/mcrypt +++ b/completions/mcrypt @@ -3,8 +3,8 @@ _mcrypt() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -g | --openpgp-z) diff --git a/completions/mdadm b/completions/mdadm index 9e231f6e5f3..d983d12a3d6 100644 --- a/completions/mdadm +++ b/completions/mdadm @@ -69,8 +69,8 @@ _mdadm_update_flag() _mdadm() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --config | --bitmap | --backup-file | -!(-*)[cb]) diff --git a/completions/mdtool b/completions/mdtool index e0eed7d88f4..807a6451923 100644 --- a/completions/mdtool +++ b/completions/mdtool @@ -2,8 +2,8 @@ _mdtool() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local command i diff --git a/completions/medusa b/completions/medusa index 8781bf7141a..296462da81b 100644 --- a/completions/medusa +++ b/completions/medusa @@ -2,8 +2,8 @@ _medusa() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*h) diff --git a/completions/mii-diag b/completions/mii-diag index 460e68bd33c..f36401284f5 100644 --- a/completions/mii-diag +++ b/completions/mii-diag @@ -2,8 +2,8 @@ _mii_diag() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -F | -A | --advertise | --fixed-speed) diff --git a/completions/mii-tool b/completions/mii-tool index 222474245dc..22ff1b3db4b 100644 --- a/completions/mii-tool +++ b/completions/mii-tool @@ -2,8 +2,8 @@ _mii_tool() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --force | -!(-*)F) diff --git a/completions/minicom b/completions/minicom index 7f61ceec308..2c620913768 100644 --- a/completions/minicom +++ b/completions/minicom @@ -2,8 +2,8 @@ _minicom() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --attrib | --color | -!(-*)[ac]) diff --git a/completions/mkinitrd b/completions/mkinitrd index b018ad6864e..dd52adad7fa 100644 --- a/completions/mkinitrd +++ b/completions/mkinitrd @@ -2,8 +2,8 @@ _mkinitrd() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --preload | --with | --builtin) diff --git a/completions/mktemp b/completions/mktemp index 075fc23011e..1325aba02b0 100644 --- a/completions/mktemp +++ b/completions/mktemp @@ -2,8 +2,8 @@ _mktemp() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case "$prev" in --help | --version | --suffix) diff --git a/completions/mmsitepass b/completions/mmsitepass index 0f738cd1979..02a70445651 100644 --- a/completions/mmsitepass +++ b/completions/mmsitepass @@ -2,8 +2,8 @@ _mmsitepass() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--listcreator --help' -- "$cur")) diff --git a/completions/modinfo b/completions/modinfo index 0111ab79121..b47a972d999 100644 --- a/completions/modinfo +++ b/completions/modinfo @@ -2,8 +2,8 @@ _modinfo() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case "$prev" in --field | -!(-*)F) diff --git a/completions/modprobe b/completions/modprobe index bb74fcf6e60..f9dcc10feb9 100644 --- a/completions/modprobe +++ b/completions/modprobe @@ -2,8 +2,8 @@ _modprobe() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case "$prev" in --help | --version | -!(-*)[hV]) diff --git a/completions/monodevelop b/completions/monodevelop index d75a81779bf..2ef1939d7ec 100644 --- a/completions/monodevelop +++ b/completions/monodevelop @@ -2,8 +2,8 @@ _monodevelop() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return $split && return diff --git a/completions/mplayer b/completions/mplayer index 1042beebe4a..12d3d1f0720 100644 --- a/completions/mplayer +++ b/completions/mplayer @@ -10,8 +10,8 @@ _mplayer_options_list() _mplayer() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return local cmd=${words[0]} i j k=0 diff --git a/completions/mr b/completions/mr index ece757f4f34..6455935d189 100644 --- a/completions/mr +++ b/completions/mr @@ -2,8 +2,8 @@ _mr() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local help commands options diff --git a/completions/msynctool b/completions/msynctool index 190d50c8735..a461ecabe7b 100644 --- a/completions/msynctool +++ b/completions/msynctool @@ -2,8 +2,8 @@ _msynctool() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $words in --configure) diff --git a/completions/mtx b/completions/mtx index 1a78714ed79..794e5f5ed14 100644 --- a/completions/mtx +++ b/completions/mtx @@ -3,8 +3,8 @@ _mtx() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local options tapes drives diff --git a/completions/munin-node-configure b/completions/munin-node-configure index 432a82f5585..c7aaa3a7250 100644 --- a/completions/munin-node-configure +++ b/completions/munin-node-configure @@ -2,8 +2,8 @@ _munin_node_configure() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --config) diff --git a/completions/munin-run b/completions/munin-run index f570bc3b10e..0006cf36dab 100644 --- a/completions/munin-run +++ b/completions/munin-run @@ -2,8 +2,8 @@ _munin_run() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --config | --sconffile) diff --git a/completions/munin-update b/completions/munin-update index 5643470c4f1..cd361b2e04f 100644 --- a/completions/munin-update +++ b/completions/munin-update @@ -2,8 +2,8 @@ _munin_update() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --config) diff --git a/completions/munindoc b/completions/munindoc index 63ce23ca7a3..47ba56fabf6 100644 --- a/completions/munindoc +++ b/completions/munindoc @@ -2,8 +2,8 @@ _munindoc() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return COMPREPLY=($(compgen -W \ '$(command ls /usr/share/munin/plugins 2>/dev/null)' -- "$cur")) diff --git a/completions/mussh b/completions/mussh index 175b1832de4..0e302e1346f 100644 --- a/completions/mussh +++ b/completions/mussh @@ -2,8 +2,8 @@ _mussh() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | -V | -m | -t) @@ -34,7 +34,7 @@ _mussh() return ;; -p | -h) - [[ $cur == *@* ]] && _user_at_host || _known_hosts_real -a -- "$cur" + [[ $cur == *@* ]] && _user_at_host "$@" || _known_hosts_real -a -- "$cur" return ;; -c) diff --git a/completions/mutt b/completions/mutt index 70263830de9..70266c76c8e 100644 --- a/completions/mutt +++ b/completions/mutt @@ -151,8 +151,8 @@ _muttfiledir() _mutt() { - local cur prev words cword - _comp_initialize -n =+! || return + local cur prev words cword comp_args + _comp_initialize -n =+! -- "$@" || return case $cur in -*) diff --git a/completions/mypy b/completions/mypy index 4ef8a51e0de..61187f23e4a 100644 --- a/completions/mypy +++ b/completions/mypy @@ -2,8 +2,8 @@ _mypy() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return [[ $cword -gt 2 && ${words[cword - 2]} == --shadow-file ]] && prev=--shadow-file # hack; takes two args diff --git a/completions/mysql b/completions/mysql index 3fe50b05c50..09b0a4f1b02 100644 --- a/completions/mysql +++ b/completions/mysql @@ -15,8 +15,8 @@ _comp_deprecate_func _mysql_character_sets _comp_xfunc_mysql_character_sets _mysql() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --user | -!(-*)u) diff --git a/completions/mysqladmin b/completions/mysqladmin index 875b448141d..e566bbfb142 100644 --- a/completions/mysqladmin +++ b/completions/mysqladmin @@ -2,8 +2,8 @@ _mysqladmin() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --user | -!(-*)u) diff --git a/completions/nc b/completions/nc index 392450d7516..f583f1e1d82 100644 --- a/completions/nc +++ b/completions/nc @@ -2,8 +2,8 @@ _nc() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return case $prev in -*[hIiMmOPpqVWw]) diff --git a/completions/ncftp b/completions/ncftp index 6eb0364b301..cff6a51b48a 100644 --- a/completions/ncftp +++ b/completions/ncftp @@ -2,8 +2,8 @@ _ncftp() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -u | -p | -P | -j | -F) diff --git a/completions/nethogs b/completions/nethogs index fb6b5eab564..891730880c6 100644 --- a/completions/nethogs +++ b/completions/nethogs @@ -2,8 +2,8 @@ _nethogs() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case "$prev" in -d) diff --git a/completions/newlist b/completions/newlist index 8e105ded2fa..18609d6a1c5 100644 --- a/completions/newlist +++ b/completions/newlist @@ -2,8 +2,8 @@ _newlist() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -l | --language | -u | --urlhost | -e | --emailhost | --help) diff --git a/completions/newusers b/completions/newusers index 85c20d57179..983810d1f1a 100644 --- a/completions/newusers +++ b/completions/newusers @@ -2,8 +2,8 @@ _newusers() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -c | --crypt) diff --git a/completions/ngrep b/completions/ngrep index 05cc89ceaf0..f68cf3126cb 100644 --- a/completions/ngrep +++ b/completions/ngrep @@ -2,8 +2,8 @@ _ngrep() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h | -V | -n | -A | -s | -S | -c | -P) diff --git a/completions/nmap b/completions/nmap index b125f027f05..a92df0f3a1b 100644 --- a/completions/nmap +++ b/completions/nmap @@ -2,8 +2,8 @@ _nmap() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -iL | -oN | -oX | -oS | -oG | ---excludefile | --resume | --stylesheet) diff --git a/completions/nproc b/completions/nproc index d5e5d1fffbb..1807fd93946 100644 --- a/completions/nproc +++ b/completions/nproc @@ -2,8 +2,8 @@ _nproc() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --version | --ignore) diff --git a/completions/nslookup b/completions/nslookup index d2875802387..1aee95907a8 100644 --- a/completions/nslookup +++ b/completions/nslookup @@ -25,8 +25,8 @@ _bind_querytype() _nslookup() { - local cur prev words cword - _comp_initialize -n = || return + local cur prev words cword comp_args + _comp_initialize -n = -- "$@" || return case $cur in -class=* | -cl=*) @@ -63,8 +63,8 @@ _nslookup() _host() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -c) diff --git a/completions/nsupdate b/completions/nsupdate index fcf973f9545..af14f8ae2ab 100644 --- a/completions/nsupdate +++ b/completions/nsupdate @@ -2,8 +2,8 @@ _nsupdate() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*[VLprtu]) diff --git a/completions/ntpdate b/completions/ntpdate index efa659bcf35..e4d2a8f891d 100644 --- a/completions/ntpdate +++ b/completions/ntpdate @@ -2,8 +2,8 @@ _ntpdate() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*k) diff --git a/completions/oggdec b/completions/oggdec index fdf1595e895..7e62b2ef196 100644 --- a/completions/oggdec +++ b/completions/oggdec @@ -2,8 +2,8 @@ _oggdec() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --version | -!(-*)[hV]*) diff --git a/completions/openssl b/completions/openssl index d1b387d8e04..58a5edae1b4 100644 --- a/completions/openssl +++ b/completions/openssl @@ -37,8 +37,8 @@ _openssl_digests() _openssl() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local commands command options formats diff --git a/completions/opera b/completions/opera index e7a714e678a..71c794d9854 100644 --- a/completions/opera +++ b/completions/opera @@ -2,8 +2,8 @@ _opera() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case "$prev" in ?(-)-widget | ?(-)-urllist | ?(-)-uiparserlog | ?(-)-uiwidgetsparserlog | \ diff --git a/completions/optipng b/completions/optipng index 65ab63aebdb..ebc126a017d 100644 --- a/completions/optipng +++ b/completions/optipng @@ -2,8 +2,8 @@ _optipng() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -'?' | -h | --help | -f) diff --git a/completions/p4 b/completions/p4 index a3ba69f6937..dae195a0d7d 100644 --- a/completions/p4 +++ b/completions/p4 @@ -3,8 +3,8 @@ _p4() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local p4commands p4filetypes diff --git a/completions/pack200 b/completions/pack200 index ae3cdd1a17d..18481596b99 100644 --- a/completions/pack200 +++ b/completions/pack200 @@ -2,8 +2,8 @@ _pack200() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -S | --segment-limit | -P | --pass-file | -C | --class-attribute | \ diff --git a/completions/passwd b/completions/passwd index bd4479d05aa..c19dc76dac7 100644 --- a/completions/passwd +++ b/completions/passwd @@ -2,8 +2,8 @@ _passwd() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --minimum | --maximum | --warning | --inactive | --help | --usage | \ diff --git a/completions/patch b/completions/patch index c0fcdcda9ca..13e4e6da7e4 100644 --- a/completions/patch +++ b/completions/patch @@ -2,8 +2,8 @@ _patch() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --strip | --ifdef | --prefix | --basename-prefix | --suffix | --get | \ diff --git a/completions/pdftoppm b/completions/pdftoppm index 6136269252a..6fcfeb454a5 100644 --- a/completions/pdftoppm +++ b/completions/pdftoppm @@ -2,8 +2,8 @@ _comp_cmd_pdftoppm() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -[flrxyWH] | -r[xy] | -scale?(-to-[xy]) | -jpegopt | -[ou]pw) diff --git a/completions/pdftotext b/completions/pdftotext index 1b9ff850d0f..673b42de0f8 100644 --- a/completions/pdftotext +++ b/completions/pdftotext @@ -2,8 +2,8 @@ _pdftotext() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h | -help | --help | -'?' | -f | -l | -r | -x | -y | -W | -H | \ diff --git a/completions/perl b/completions/perl index 1c72cc120a6..f97dd274924 100644 --- a/completions/perl +++ b/completions/perl @@ -10,8 +10,8 @@ _perl_helper() _perl() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return local prefix="" temp optPrefix optSuffix @@ -94,8 +94,8 @@ _perl() _perldoc() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return local prefix="" temp diff --git a/completions/perlcritic b/completions/perlcritic index 3d38c17586a..a508259c833 100644 --- a/completions/perlcritic +++ b/completions/perlcritic @@ -2,8 +2,8 @@ _perlcritic() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version | --top | --include | --exclude | --single-policy | \ diff --git a/completions/perltidy b/completions/perltidy index 95aa49047ce..7a72d74694b 100644 --- a/completions/perltidy +++ b/completions/perltidy @@ -2,8 +2,8 @@ _perltidy() { - local cur prev words cword - _comp_initialize -n = || return + local cur prev words cword comp_args + _comp_initialize -n = -- "$@" || return case $prev in -h | --help) diff --git a/completions/pgrep b/completions/pgrep index d4c01ed39c4..3660484ae40 100644 --- a/completions/pgrep +++ b/completions/pgrep @@ -2,8 +2,8 @@ _pgrep() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --delimiter | --pgroup | --session | --terminal | -!(-*)[cdgJMNstTz]) diff --git a/completions/pidof b/completions/pidof index 23de88e3848..e868d0a6437 100644 --- a/completions/pidof +++ b/completions/pidof @@ -2,8 +2,8 @@ _pidof() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | -V | --version | -!(-*)[hV]*) diff --git a/completions/pine b/completions/pine index abf57ad1186..b50a14856fb 100644 --- a/completions/pine +++ b/completions/pine @@ -2,8 +2,8 @@ _pine() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -help | -d | -f | -c | -I | -n | -url | -copy_pinerc | -copy_abook) diff --git a/completions/ping b/completions/ping index e83ffe62d71..d79ff6ab9d2 100644 --- a/completions/ping +++ b/completions/ping @@ -2,8 +2,8 @@ _ping() { - local cur prev words cword - _comp_initialize -n = || return + local cur prev words cword comp_args + _comp_initialize -n = -- "$@" || return local ipvx diff --git a/completions/pkg-config b/completions/pkg-config index c3a7305133a..e3c0fa5d43a 100644 --- a/completions/pkg-config +++ b/completions/pkg-config @@ -2,8 +2,8 @@ _pkg_config() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --define-variable | --atleast-version | --atleast-pkgconfig-version | \ diff --git a/completions/pkg_delete b/completions/pkg_delete index 4f917178ded..515ef7fd14f 100644 --- a/completions/pkg_delete +++ b/completions/pkg_delete @@ -2,8 +2,8 @@ _pkg_delete() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local pkgdir=${PKG_DBDIR:-/var/db/pkg}/ diff --git a/completions/pkgadd b/completions/pkgadd index 80b1470dc48..f92e8a1119a 100644 --- a/completions/pkgadd +++ b/completions/pkgadd @@ -4,8 +4,8 @@ _pkgadd() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return # if a device directory was given # we must complete with the package diff --git a/completions/pkgrm b/completions/pkgrm index 61dde2ff6e5..005d7bbac80 100644 --- a/completions/pkgrm +++ b/completions/pkgrm @@ -4,8 +4,8 @@ _pkgrm() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return # if a spool directory was given # we must complete with the package diff --git a/completions/pkgtool b/completions/pkgtool index 16c89a52184..b37d43f90ce 100644 --- a/completions/pkgtool +++ b/completions/pkgtool @@ -2,8 +2,8 @@ _pkgtool() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case "$prev" in --source_dir | --target_dir) diff --git a/completions/pkgutil b/completions/pkgutil index 1566835ad04..de552ad4342 100644 --- a/completions/pkgutil +++ b/completions/pkgutil @@ -14,8 +14,8 @@ _pkgutil_url2catalog() _pkgutil() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return local command catalog_files configuration_files declare -a configuration_files=( diff --git a/completions/plague-client b/completions/plague-client index a19997818b4..01e4a7e390d 100644 --- a/completions/plague-client +++ b/completions/plague-client @@ -2,8 +2,8 @@ _plague_client() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return ((cword == 1)) && COMPREPLY=($(compgen -W 'build detail finish help is_paused kill list diff --git a/completions/pm-hibernate b/completions/pm-hibernate index 6393c88c5f2..94cdf9147fd 100644 --- a/completions/pm-hibernate +++ b/completions/pm-hibernate @@ -2,8 +2,8 @@ _pm_action() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return COMPREPLY=($(compgen -W "--help $(_parse_help "$1")" -- "$cur")) } && diff --git a/completions/pm-is-supported b/completions/pm-is-supported index e2e0e1ee5fb..9e7a01bba43 100644 --- a/completions/pm-is-supported +++ b/completions/pm-is-supported @@ -2,8 +2,8 @@ _pm_is_supported() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return COMPREPLY=($(compgen -W '--help --suspend --hibernate --suspend-hybrid' \ -- "$cur")) diff --git a/completions/pm-powersave b/completions/pm-powersave index aa50c834238..67e293cee6f 100644 --- a/completions/pm-powersave +++ b/completions/pm-powersave @@ -2,8 +2,8 @@ _pm_powersave() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return COMPREPLY=($(compgen -W "true false" -- "$cur")) } && diff --git a/completions/pngfix b/completions/pngfix index 3fe9615b3c5..ab0f2089429 100644 --- a/completions/pngfix +++ b/completions/pngfix @@ -2,8 +2,8 @@ _pngfix() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --suffix | --prefix) diff --git a/completions/portinstall b/completions/portinstall index 82f57f531e8..d64c3ba0503 100644 --- a/completions/portinstall +++ b/completions/portinstall @@ -2,8 +2,8 @@ _portinstall() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local portsdir indexfile local -a COMPREPLY2 diff --git a/completions/portsnap b/completions/portsnap index 9dff283bbb2..9b58da95a80 100644 --- a/completions/portsnap +++ b/completions/portsnap @@ -4,8 +4,8 @@ _portsnap() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -d | -p) diff --git a/completions/portupgrade b/completions/portupgrade index 476e18142c1..9402ea7b84a 100644 --- a/completions/portupgrade +++ b/completions/portupgrade @@ -2,8 +2,8 @@ _portupgrade() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return [[ $prev == -l || $prev == -L || $prev == -o ]] && return diff --git a/completions/postcat b/completions/postcat index 46cdc719a4e..5d75dc31383 100644 --- a/completions/postcat +++ b/completions/postcat @@ -2,8 +2,8 @@ _postcat() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -c) diff --git a/completions/postconf b/completions/postconf index c2e8d59b5b1..bf1096f59c0 100644 --- a/completions/postconf +++ b/completions/postconf @@ -2,8 +2,8 @@ _postconf() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local eqext diff --git a/completions/postfix b/completions/postfix index cb4293b15ec..c1f32963fb7 100644 --- a/completions/postfix +++ b/completions/postfix @@ -2,8 +2,8 @@ _postfix() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -c) diff --git a/completions/postmap b/completions/postmap index 0c2fd9d73fc..9ca1cb1ec50 100644 --- a/completions/postmap +++ b/completions/postmap @@ -2,8 +2,8 @@ _postmap() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -c) diff --git a/completions/postsuper b/completions/postsuper index 464a91e28a7..0219405dae6 100644 --- a/completions/postsuper +++ b/completions/postsuper @@ -2,8 +2,8 @@ _postsuper() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local pval len diff --git a/completions/povray b/completions/povray index d2915f7d0b5..d66432a2122 100644 --- a/completions/povray +++ b/completions/povray @@ -3,8 +3,8 @@ _povray() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local povcur=$cur pfx oext defoext defoext=png # default output extension, if cannot be determined FIXME diff --git a/completions/prelink b/completions/prelink index 50b3d297d2c..1293f331ed1 100644 --- a/completions/prelink +++ b/completions/prelink @@ -2,8 +2,8 @@ _prelink() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -'?' | --help | --usage | -V | --version | -r | --reloc-only) diff --git a/completions/printenv b/completions/printenv index 8099529131e..c3f3393b50a 100644 --- a/completions/printenv +++ b/completions/printenv @@ -2,8 +2,8 @@ _printenv() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version) diff --git a/completions/protoc b/completions/protoc index f4ff0786f19..e0825233a05 100644 --- a/completions/protoc +++ b/completions/protoc @@ -2,8 +2,8 @@ _protoc() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --version | -h | --help | --encode | --decode) diff --git a/completions/ps b/completions/ps index d02ee337882..a89ab8e5ae1 100644 --- a/completions/ps +++ b/completions/ps @@ -2,8 +2,8 @@ _comp_cmd_ps() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help) diff --git a/completions/psql b/completions/psql index 61d57b9a4e7..646fc34e844 100644 --- a/completions/psql +++ b/completions/psql @@ -20,8 +20,8 @@ _pg_users() # _createdb() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --host | -!(-*)h) @@ -53,8 +53,8 @@ _createdb() # _createuser() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --version | --port | --connection-limit | -!(-*)[pc]) @@ -83,8 +83,8 @@ _createuser() # _dropdb() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --host | -!(-*)h) @@ -115,8 +115,8 @@ _dropdb() # _dropuser() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --version | --port | -!(-*)p) @@ -147,8 +147,8 @@ _dropuser() # _psql() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --host | -!(-*)h) diff --git a/completions/puppet b/completions/puppet index 5c67c0db4d7..e54087c98e0 100644 --- a/completions/puppet +++ b/completions/puppet @@ -62,8 +62,8 @@ _puppet_subcmd_opts() _puppet() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local subcommand action diff --git a/completions/pv b/completions/pv index 713f55bcfeb..33587d66b12 100644 --- a/completions/pv +++ b/completions/pv @@ -2,8 +2,8 @@ _pv() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version | --last-written | --format | --delay-start | \ diff --git a/completions/pwck b/completions/pwck index 6fec79e437e..91459898e5f 100644 --- a/completions/pwck +++ b/completions/pwck @@ -2,8 +2,8 @@ _pwck() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($( diff --git a/completions/pwd b/completions/pwd index 1f8492ede84..b7f6cc967ca 100644 --- a/completions/pwd +++ b/completions/pwd @@ -2,8 +2,8 @@ _pwd() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version) diff --git a/completions/pwdx b/completions/pwdx index ce99ae3aaf1..cec6af70915 100644 --- a/completions/pwdx +++ b/completions/pwdx @@ -2,8 +2,8 @@ _pwdx() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h | --help | -V | --version) diff --git a/completions/pwgen b/completions/pwgen index a2107d50f60..5a46301e8a1 100644 --- a/completions/pwgen +++ b/completions/pwgen @@ -2,8 +2,8 @@ _pwgen() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --num-passwords | --help | -!(-*)[Nh]) diff --git a/completions/pycodestyle b/completions/pycodestyle index aa686a842d9..c2466bddc0c 100644 --- a/completions/pycodestyle +++ b/completions/pycodestyle @@ -2,8 +2,8 @@ _pycodestyle() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -h | --help | --version) diff --git a/completions/pydoc b/completions/pydoc index d3235a4e676..ff21d8360a3 100644 --- a/completions/pydoc +++ b/completions/pydoc @@ -2,8 +2,8 @@ _pydoc() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -k | -p) diff --git a/completions/pydocstyle b/completions/pydocstyle index 81a7e9fcf05..5dae7479836 100644 --- a/completions/pydocstyle +++ b/completions/pydocstyle @@ -2,8 +2,8 @@ _pydocstyle() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --version | --match | --ignore-decorators | --select | \ diff --git a/completions/pyflakes b/completions/pyflakes index 58ad3a6e90e..af1c616aaac 100644 --- a/completions/pyflakes +++ b/completions/pyflakes @@ -2,8 +2,8 @@ _pyflakes() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h | --help | --version) diff --git a/completions/pylint b/completions/pylint index 87aa575a6a1..2f8e1c71d25 100644 --- a/completions/pylint +++ b/completions/pylint @@ -21,8 +21,8 @@ _comp_cmd_pylint_message_ids() _pylint() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local python=python [[ ${1##*/} == *3* ]] && python=python3 diff --git a/completions/pytest b/completions/pytest index 7d9255e78c1..99bea08986b 100644 --- a/completions/pytest +++ b/completions/pytest @@ -10,8 +10,8 @@ _pytest_option_choice_args() _pytest() { - local cur prev words cword split - _comp_initialize -s -n : || return + local cur prev words cword split comp_args + _comp_initialize -s -n : -- "$@" || return case $prev in --help | --maxfail | --report | --junit-prefix | --doctest-glob | \ diff --git a/completions/python b/completions/python index 16d4fa59387..8d5731465ab 100644 --- a/completions/python +++ b/completions/python @@ -18,8 +18,8 @@ _comp_deprecate_func _python_warning_actions _comp_xfunc_python_warning_actions _python() { - local cur prev words cword prefix - _comp_initialize || return + local cur prev words cword comp_args prefix + _comp_initialize -- "$@" || return case $cur in -[QWX]?*) diff --git a/completions/pyvenv b/completions/pyvenv index 4413a814605..231a829bdd2 100644 --- a/completions/pyvenv +++ b/completions/pyvenv @@ -2,8 +2,8 @@ _pyvenv() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -h | --help) @@ -14,7 +14,7 @@ _pyvenv() $split && return if [[ $cur == -* ]]; then - _longopt "$1" + _longopt "$@" return fi diff --git a/completions/qdbus b/completions/qdbus index 55eac734007..eaaf937d0b8 100644 --- a/completions/qdbus +++ b/completions/qdbus @@ -2,8 +2,8 @@ _qdbus() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return [[ $cur ]] && unset -v "words[$((${#words[@]} - 1))]" COMPREPLY=($(compgen -W '$(command ${words[@]} 2>/dev/null | \ diff --git a/completions/qemu b/completions/qemu index 05c411f7c13..6ceac07950e 100644 --- a/completions/qemu +++ b/completions/qemu @@ -2,8 +2,8 @@ _qemu() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -fd[ab] | -hd[abcd] | -cdrom | -option-rom | -kernel | -initrd | \ diff --git a/completions/qrunner b/completions/qrunner index f904c9f78db..3eaa8522ed1 100644 --- a/completions/qrunner +++ b/completions/qrunner @@ -2,8 +2,8 @@ _qrunner() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return $split && return diff --git a/completions/querybts b/completions/querybts index 667c56550bb..9370b6a4c74 100644 --- a/completions/querybts +++ b/completions/querybts @@ -2,8 +2,8 @@ _querybts() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --bts | -!(-*)B) diff --git a/completions/quota b/completions/quota index 7079b601a99..e0c06608a61 100644 --- a/completions/quota +++ b/completions/quota @@ -39,8 +39,8 @@ _filesystems() _quota() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -F | --format) @@ -64,8 +64,8 @@ _quota() _setquota() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -F | --format) @@ -104,8 +104,8 @@ _setquota() _edquota() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -F | --format) @@ -137,8 +137,8 @@ _edquota() _quotacheck() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -F | --format) @@ -162,8 +162,8 @@ _quotacheck() _quotaon() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -F | --format) diff --git a/completions/radvdump b/completions/radvdump index 9d9afa3b5c5..c6e52613ee8 100644 --- a/completions/radvdump +++ b/completions/radvdump @@ -2,8 +2,8 @@ _radvdump() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h | --help | -v | --version) diff --git a/completions/rcs b/completions/rcs index 07cd18a41a4..571c46cfea7 100644 --- a/completions/rcs +++ b/completions/rcs @@ -2,8 +2,8 @@ _rcs() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local file dir i diff --git a/completions/rdesktop b/completions/rdesktop index 2b38123f393..342e781a1f7 100644 --- a/completions/rdesktop +++ b/completions/rdesktop @@ -2,8 +2,8 @@ _rdesktop() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return case $prev in -*k) diff --git a/completions/remove_members b/completions/remove_members index d53cebf19fd..581c47b2662 100644 --- a/completions/remove_members +++ b/completions/remove_members @@ -2,8 +2,8 @@ _remove_members() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -f | --file) diff --git a/completions/removepkg b/completions/removepkg index 77883494af2..2d74241086c 100644 --- a/completions/removepkg +++ b/completions/removepkg @@ -2,8 +2,8 @@ _removepkg() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '-copy -keep -preserve -warn' -- "$cur")) return diff --git a/completions/reportbug b/completions/reportbug index 77eff93e598..dad53e6a63a 100644 --- a/completions/reportbug +++ b/completions/reportbug @@ -2,8 +2,8 @@ _reportbug() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --class | --header | --pseudo-header | --mirror | --list-cc | \ diff --git a/completions/resolvconf b/completions/resolvconf index 5e262ee4b6a..a544bed1a17 100644 --- a/completions/resolvconf +++ b/completions/resolvconf @@ -2,8 +2,8 @@ _resolvconf() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -a | -d) diff --git a/completions/ri b/completions/ri index 927841ed45f..4a34a39406e 100644 --- a/completions/ri +++ b/completions/ri @@ -35,8 +35,8 @@ _ri_get_methods() # needs at least Ruby 1.8.0 in order to use -W0 _ri() { - local cur prev words cword split - _comp_initialize -s -n : || return + local cur prev words cword split comp_args + _comp_initialize -s -n : -- "$@" || return case $prev in --help | --width | -!(-*)[hw]) diff --git a/completions/rmlist b/completions/rmlist index 4443ee577c4..e7fb98a2597 100644 --- a/completions/rmlist +++ b/completions/rmlist @@ -2,8 +2,8 @@ _rmlist() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--archives --help' -- "$cur")) diff --git a/completions/rmmod b/completions/rmmod index a72d3899924..10820b5e41e 100644 --- a/completions/rmmod +++ b/completions/rmmod @@ -3,8 +3,8 @@ _rmmod() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h | --help | -V | --version) diff --git a/completions/route b/completions/route index ae7c1bddf0d..6a938bb877d 100644 --- a/completions/route +++ b/completions/route @@ -4,8 +4,8 @@ _route() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $prev == dev ]]; then _available_interfaces diff --git a/completions/rpcdebug b/completions/rpcdebug index 906ab665b59..592c5d3063c 100644 --- a/completions/rpcdebug +++ b/completions/rpcdebug @@ -19,8 +19,8 @@ _rpcdebug_flags() _rpcdebug() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*s) diff --git a/completions/rpm b/completions/rpm index d874ff24767..f4212e8445b 100644 --- a/completions/rpm +++ b/completions/rpm @@ -47,8 +47,8 @@ _rpm_buildarchs() # _rpm() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return if ((cword == 1)); then # first parameter on line @@ -239,8 +239,8 @@ _rpm() _rpmbuild() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local rpm="${1%build*}" [[ $rpm == "$1" ]] || ! type $rpm &>/dev/null && rpm= diff --git a/completions/rpm2tgz b/completions/rpm2tgz index 4563b8d41b1..33170440acb 100644 --- a/completions/rpm2tgz +++ b/completions/rpm2tgz @@ -2,8 +2,8 @@ _rpm2tgz() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '-s -S -n -r -d -c' -- "$cur")) diff --git a/completions/rpmcheck b/completions/rpmcheck index 21f45d7bb97..59b54db40b2 100644 --- a/completions/rpmcheck +++ b/completions/rpmcheck @@ -2,8 +2,8 @@ _rpmcheck() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -base) diff --git a/completions/rrdtool b/completions/rrdtool index eeff61a566e..8fd7c86cbd4 100644 --- a/completions/rrdtool +++ b/completions/rrdtool @@ -2,8 +2,8 @@ _rrdtool() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if ((${#words[@]} == 2)); then COMPREPLY=($(compgen -W 'create update updatev graph dump restore diff --git a/completions/rsync b/completions/rsync index 31df388dca8..d97b3b8c036 100644 --- a/completions/rsync +++ b/completions/rsync @@ -2,8 +2,8 @@ _rsync() { - local cur prev words cword split - _comp_initialize -s -n : || return + local cur prev words cword split comp_args + _comp_initialize -s -n : -- "$@" || return case $prev in --config | --password-file | --include-from | --exclude-from | \ diff --git a/completions/sbcl b/completions/sbcl index 2872b4250ef..83545a26aa9 100644 --- a/completions/sbcl +++ b/completions/sbcl @@ -4,8 +4,8 @@ _sbcl() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return # completing an option (may or may not be separated by a space) if [[ $cur == -* ]]; then diff --git a/completions/sbopkg b/completions/sbopkg index b0d7978433b..1f29433aa97 100644 --- a/completions/sbopkg +++ b/completions/sbopkg @@ -2,8 +2,8 @@ _sbopkg() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur")) diff --git a/completions/screen b/completions/screen index 1f4783c897a..7b38c036b6f 100644 --- a/completions/screen +++ b/completions/screen @@ -23,8 +23,8 @@ _screen_sessions() } && _screen() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if ((cword == 1)); then if [[ $cur == /dev* ]]; then diff --git a/completions/scrub b/completions/scrub index 15c62bf6683..fb9e0be1422 100644 --- a/completions/scrub +++ b/completions/scrub @@ -2,8 +2,8 @@ _scrub() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --version | --help | --blocksize | --device-size | --dirent | \ diff --git a/completions/secret-tool b/completions/secret-tool index bcf881e41d2..2979f997aa0 100644 --- a/completions/secret-tool +++ b/completions/secret-tool @@ -2,8 +2,8 @@ _secret_tool() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return $split && return diff --git a/completions/sh b/completions/sh index b611d19a105..405ebe82d44 100644 --- a/completions/sh +++ b/completions/sh @@ -2,8 +2,8 @@ _sh() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -c) diff --git a/completions/sha256sum b/completions/sha256sum index 6dc8f617c1f..d63203d8205 100644 --- a/completions/sha256sum +++ b/completions/sha256sum @@ -2,8 +2,8 @@ _comp_cmd_sha256sum() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -h | --help | --version) @@ -14,7 +14,7 @@ _comp_cmd_sha256sum() $split && return if [[ $cur == -* ]]; then - _longopt "$1" + _longopt "$@" return fi diff --git a/completions/shellcheck b/completions/shellcheck index fda5d74b2b8..9c50b5d3b9c 100644 --- a/completions/shellcheck +++ b/completions/shellcheck @@ -9,8 +9,8 @@ _shellcheck_optarg() _shellcheck() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --version | -!(-*)V*) diff --git a/completions/sitecopy b/completions/sitecopy index 0f143aec3d1..7562e18079c 100644 --- a/completions/sitecopy +++ b/completions/sitecopy @@ -5,8 +5,8 @@ _sitecopy() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --debug | -!(-*)d) diff --git a/completions/slapt-get b/completions/slapt-get index 3454a2da8d9..0fc8b653819 100644 --- a/completions/slapt-get +++ b/completions/slapt-get @@ -2,8 +2,8 @@ _slapt_get() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case "$prev" in --config | -c) diff --git a/completions/slapt-src b/completions/slapt-src index ae55906f3f0..03de909eb22 100644 --- a/completions/slapt-src +++ b/completions/slapt-src @@ -2,8 +2,8 @@ _slapt_src() { - local cur prev words cword split - _comp_initialize -s -n : || return + local cur prev words cword split comp_args + _comp_initialize -s -n : -- "$@" || return case "$prev" in --config | -c) diff --git a/completions/smartctl b/completions/smartctl index 3fcda6cf168..adae2904670 100644 --- a/completions/smartctl +++ b/completions/smartctl @@ -93,8 +93,8 @@ _smartctl_drivedb() _smartctl() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --quietmode | -!(-*)q) diff --git a/completions/smbclient b/completions/smbclient index 9919c4d1aea..c72d556bc06 100644 --- a/completions/smbclient +++ b/completions/smbclient @@ -41,8 +41,8 @@ _samba_signing() _smbclient() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --name-resolve | -!(-*)R) @@ -107,8 +107,8 @@ _smbclient() _smbget() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --outputfile | --rcfile | -!(-*)[of]) @@ -139,8 +139,8 @@ _smbget() _smbcacls() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --configfile | --authentication-file | -!(-*)[As]) @@ -184,8 +184,8 @@ _smbcacls() _smbcquotas() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --configfile | --authentication-file | -!(-*)[sA]) @@ -220,8 +220,8 @@ _smbcquotas() _smbpasswd() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*r) @@ -253,8 +253,8 @@ _smbpasswd() _smbtar() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*[rt]) @@ -286,8 +286,8 @@ _smbtar() _smbtree() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --configfile | --authentication-file | -!(-*)[sA]) diff --git a/completions/snownews b/completions/snownews index b61bc2a060d..9f031a5eba3 100644 --- a/completions/snownews +++ b/completions/snownews @@ -2,8 +2,8 @@ _snownews() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then # return list of available options diff --git a/completions/sqlite3 b/completions/sqlite3 index 7c53e57ddc0..3e79edb9c7e 100644 --- a/completions/sqlite3 +++ b/completions/sqlite3 @@ -2,8 +2,8 @@ _sqlite3() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local dbexts='@(sqlite?(3)|?(s?(3))db)' diff --git a/completions/ss b/completions/ss index 810c3954d3e..a76f94dc347 100644 --- a/completions/ss +++ b/completions/ss @@ -2,8 +2,8 @@ _ss() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --version | -!(-*)[hV]) diff --git a/completions/ssh b/completions/ssh index 27055bfb7ad..7ed7269064b 100644 --- a/completions/ssh +++ b/completions/ssh @@ -262,8 +262,8 @@ _comp_deprecate_func _ssh_identityfile _comp_xfunc_ssh_identityfile _ssh() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return local configfile _ssh_configfile @@ -365,8 +365,8 @@ _ssh() # _sftp() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local configfile _ssh_configfile @@ -504,8 +504,8 @@ _comp_deprecate_func _scp_local_files _comp_xfunc_ssh_scp_local_files # _scp() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return local configfile _ssh_configfile diff --git a/completions/ssh-add b/completions/ssh-add index a7de9372df8..fcb876dd94a 100644 --- a/completions/ssh-add +++ b/completions/ssh-add @@ -2,8 +2,8 @@ _ssh_add() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*E) diff --git a/completions/ssh-copy-id b/completions/ssh-copy-id index b929d88ce1e..21145873bd0 100644 --- a/completions/ssh-copy-id +++ b/completions/ssh-copy-id @@ -2,8 +2,8 @@ _ssh_copy_id() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return _comp_xfunc ssh suboption_check "$1" && return diff --git a/completions/ssh-keygen b/completions/ssh-keygen index 316d0ecdb39..5d9dfdae67b 100644 --- a/completions/ssh-keygen +++ b/completions/ssh-keygen @@ -2,8 +2,8 @@ _ssh_keygen() { - local cur prev words cword - _comp_initialize -n := || return + local cur prev words cword comp_args + _comp_initialize -n := -- "$@" || return case $prev in -*[aCIJjMNPSVWz]) diff --git a/completions/ssh-keyscan b/completions/ssh-keyscan index 95aacca0ee3..45fd14c4cdc 100644 --- a/completions/ssh-keyscan +++ b/completions/ssh-keyscan @@ -2,8 +2,8 @@ _comp_cmd_ssh_keyscan() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local ipvx diff --git a/completions/sshfs b/completions/sshfs index e03588a4a13..6be0166773c 100644 --- a/completions/sshfs +++ b/completions/sshfs @@ -2,8 +2,8 @@ _sshfs() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return _expand || return diff --git a/completions/sshmitm b/completions/sshmitm index 77695a09bc9..cf04c86a4fd 100644 --- a/completions/sshmitm +++ b/completions/sshmitm @@ -2,8 +2,8 @@ _sshmitm() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur")) diff --git a/completions/sshow b/completions/sshow index d6ca1df787a..6be577c7a64 100644 --- a/completions/sshow +++ b/completions/sshow @@ -2,8 +2,8 @@ _sshow() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*i) diff --git a/completions/strace b/completions/strace index 052487aa368..ded9e45a031 100644 --- a/completions/strace +++ b/completions/strace @@ -2,8 +2,8 @@ _strace() { - local cur prev words cword - _comp_initialize -n = || return + local cur prev words cword comp_args + _comp_initialize -n = -- "$@" || return # check if we're still completing strace local offset=0 i diff --git a/completions/strings b/completions/strings index a7629e11126..1b41cedda05 100644 --- a/completions/strings +++ b/completions/strings @@ -2,8 +2,8 @@ _strings() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --version | --bytes | --output-separator | -arch | \ diff --git a/completions/sudo b/completions/sudo index 7bdfc28b411..9c366b2ec65 100644 --- a/completions/sudo +++ b/completions/sudo @@ -2,8 +2,8 @@ _sudo() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local i mode=normal [[ $1 == *sudoedit ]] && mode=edit diff --git a/completions/svcadm b/completions/svcadm index 1ecf6843708..6fda0e1bce9 100644 --- a/completions/svcadm +++ b/completions/svcadm @@ -99,8 +99,8 @@ _smf_complete_fmri() _svcadm() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return local command_list="enable disable restart refresh clear mark milestone" local command i diff --git a/completions/svk b/completions/svk index 663726d38c4..c741243d997 100644 --- a/completions/svk +++ b/completions/svk @@ -2,8 +2,8 @@ _svk() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local commands options command diff --git a/completions/sync_members b/completions/sync_members index 27830dfb87e..f69c65d1f5a 100644 --- a/completions/sync_members +++ b/completions/sync_members @@ -2,8 +2,8 @@ _sync_members() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -w | -g | -d | --welcome-msg | --goodbye-msg | --digest) diff --git a/completions/synclient b/completions/synclient index fa7b70423b8..d5d7e0f1ef7 100644 --- a/completions/synclient +++ b/completions/synclient @@ -2,8 +2,8 @@ _synclient() { - local cur prev words cword - _comp_initialize -n = || return + local cur prev words cword comp_args + _comp_initialize -n = -- "$@" || return case $prev in -\? | -h | -V) diff --git a/completions/sysbench b/completions/sysbench index 1e9c59d7297..2af547afffb 100644 --- a/completions/sysbench +++ b/completions/sysbench @@ -2,8 +2,8 @@ _sysbench() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --num-threads | --max-requests | --max-time | --thread-stack-size | \ diff --git a/completions/sysctl b/completions/sysctl index a3656c1a4e0..a6a59bed844 100644 --- a/completions/sysctl +++ b/completions/sysctl @@ -2,8 +2,8 @@ _sysctl() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version | --pattern | -!(-*)[hVr]) diff --git a/completions/tar b/completions/tar index d4bbb5c1e04..98ca6ca39c1 100644 --- a/completions/tar +++ b/completions/tar @@ -503,9 +503,9 @@ _gtar() local PS4='$BASH_SOURCE:$LINENO: ' fi - local cur prev words cword split + local cur prev words cword split comp_args - _comp_initialize -s || return + _comp_initialize -s -- "$@" || return # Fill the {long,short}_{opts,arg*} __gnu_tar_parse_help @@ -685,9 +685,9 @@ _posix_tar() # The mode argument, e.g. -cpf or -c local tar_mode_arg= - local cur prev words cword split + local cur prev words cword split comp_args - _comp_initialize -s || return + _comp_initialize -s -- "$@" || return basic_tar=yes tar_mode=none diff --git a/completions/tcpdump b/completions/tcpdump index 2ea2d5207ac..d97185fed5b 100644 --- a/completions/tcpdump +++ b/completions/tcpdump @@ -2,8 +2,8 @@ _tcpdump() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -!(-*)[rwFV]) diff --git a/completions/tcpkill b/completions/tcpkill index 9d59fe28f92..8bf50c512f9 100644 --- a/completions/tcpkill +++ b/completions/tcpkill @@ -2,8 +2,8 @@ _tcpkill() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*i) diff --git a/completions/tcpnice b/completions/tcpnice index 4a0d086667b..049ce570a35 100644 --- a/completions/tcpnice +++ b/completions/tcpnice @@ -2,8 +2,8 @@ _tcpnice() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*i) diff --git a/completions/timeout b/completions/timeout index a55f0804ba5..1a1fb0979d9 100644 --- a/completions/timeout +++ b/completions/timeout @@ -2,8 +2,8 @@ _timeout() { - local cur prev words cword split i found=false - _comp_initialize -s || return + local cur prev words cword split comp_args i found=false + _comp_initialize -s -- "$@" || return for ((i = 1; i <= COMP_CWORD; i++)); do if [[ ${COMP_WORDS[i]} != -* && ${COMP_WORDS[i - 1]} != = ]]; then diff --git a/completions/tipc b/completions/tipc index 31d27a27fdf..c69778f4c96 100644 --- a/completions/tipc +++ b/completions/tipc @@ -79,8 +79,8 @@ _tipc_link() _tipc() { - local cur prev words cword optind i p - _comp_initialize || return + local cur prev words cword comp_args optind i p + _comp_initialize -- "$@" || return optind=1 COMPREPLY=() diff --git a/completions/tox b/completions/tox index 9b68f177a43..21a5e224b84 100644 --- a/completions/tox +++ b/completions/tox @@ -2,8 +2,8 @@ _tox() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return # Complete defaults following a "--" if [[ "${words[*]:0:cword} " == *\ --\ * && $cur != -- ]]; then diff --git a/completions/tracepath b/completions/tracepath index 6c076b5ade6..8f6e7ba2b06 100644 --- a/completions/tracepath +++ b/completions/tracepath @@ -2,8 +2,8 @@ _tracepath() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*[lmp]) diff --git a/completions/tree b/completions/tree index 19d5b81df73..8a4ac120913 100644 --- a/completions/tree +++ b/completions/tree @@ -2,8 +2,8 @@ _comp_cmd_tree() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -!(-*)[LPIHT] | --filelimit | --timefmt | --help | --version) diff --git a/completions/truncate b/completions/truncate index 28cae4dc7ba..db8f645a31e 100644 --- a/completions/truncate +++ b/completions/truncate @@ -2,8 +2,8 @@ _comp_cmd_truncate() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -!(-*)s | --size | --help | --version) diff --git a/completions/tshark b/completions/tshark index ae9e35bfe8f..dd8fdb5ab2a 100644 --- a/completions/tshark +++ b/completions/tshark @@ -2,8 +2,8 @@ _tshark() { - local cur prev words cword prefix - _comp_initialize -n : || return + local cur prev words cword comp_args prefix + _comp_initialize -n : -- "$@" || return case $cur in -o*) diff --git a/completions/tsig-keygen b/completions/tsig-keygen index adea1b13941..aad737b68a6 100644 --- a/completions/tsig-keygen +++ b/completions/tsig-keygen @@ -2,8 +2,8 @@ _tsig_keygen() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h) diff --git a/completions/tune2fs b/completions/tune2fs index c534f0fbf6e..7d897d948f3 100644 --- a/completions/tune2fs +++ b/completions/tune2fs @@ -2,8 +2,8 @@ _tune2fs() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*[cCEiJLmrT]) diff --git a/completions/ulimit b/completions/ulimit index 3d8c52d364b..4c3e0bda1b8 100644 --- a/completions/ulimit +++ b/completions/ulimit @@ -2,8 +2,8 @@ _ulimit() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return # TODO combined option support (-aH, -Sc etc) diff --git a/completions/unace b/completions/unace index 3a1f09d24b6..69f54aae99d 100644 --- a/completions/unace +++ b/completions/unace @@ -2,8 +2,8 @@ _unace() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '-c -c- -f -f- -o -o- -p -y -y-' -- "$cur")) diff --git a/completions/unpack200 b/completions/unpack200 index c021dc8a064..a785dd35e06 100644 --- a/completions/unpack200 +++ b/completions/unpack200 @@ -2,8 +2,8 @@ _unpack200() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --version | -!(-*)[?hVJ]) diff --git a/completions/unrar b/completions/unrar index 41f5662634d..8ff353d452a 100644 --- a/completions/unrar +++ b/completions/unrar @@ -2,8 +2,8 @@ _unrar() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '-ad -ap -av- -c- -cfg- -cl -cu -dh -ep -f diff --git a/completions/unshunt b/completions/unshunt index 6bdb362061d..c010ff64832 100644 --- a/completions/unshunt +++ b/completions/unshunt @@ -2,8 +2,8 @@ _unshunt() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur")) diff --git a/completions/update-alternatives b/completions/update-alternatives index 71c849ef032..c73c425e0a7 100644 --- a/completions/update-alternatives +++ b/completions/update-alternatives @@ -18,8 +18,8 @@ _installed_alternatives() _update_alternatives() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --altdir | --admindir) diff --git a/completions/update-rc.d b/completions/update-rc.d index 57dc910158b..d15ea6948dc 100644 --- a/completions/update-rc.d +++ b/completions/update-rc.d @@ -4,8 +4,8 @@ _update_rc_d() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local sysvdir services options diff --git a/completions/upgradepkg b/completions/upgradepkg index ea33ec58878..7d983924d59 100644 --- a/completions/upgradepkg +++ b/completions/upgradepkg @@ -2,8 +2,8 @@ _upgradepkg() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--dry-run --install-new --reinstall diff --git a/completions/urlsnarf b/completions/urlsnarf index 9a481c7a1c1..7876dd23551 100644 --- a/completions/urlsnarf +++ b/completions/urlsnarf @@ -2,8 +2,8 @@ _urlsnarf() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*i) diff --git a/completions/uscan b/completions/uscan index d26b4e38050..c8b8c9cc714 100644 --- a/completions/uscan +++ b/completions/uscan @@ -2,8 +2,8 @@ _uscan() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --package) diff --git a/completions/useradd b/completions/useradd index 49da5a8a3f5..c43438a0b75 100644 --- a/completions/useradd +++ b/completions/useradd @@ -2,8 +2,8 @@ _useradd() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return # TODO: if -o/--non-unique is given, could complete on existing uids # with -u/--uid diff --git a/completions/userdel b/completions/userdel index 13457ea08f3..117dafebb58 100644 --- a/completions/userdel +++ b/completions/userdel @@ -2,8 +2,8 @@ _userdel() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | -!(-*)h) diff --git a/completions/usermod b/completions/usermod index d36c6afb191..6e7e1ebd780 100644 --- a/completions/usermod +++ b/completions/usermod @@ -2,8 +2,8 @@ _usermod() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return # TODO: if -o/--non-unique is given, could complete on existing uids # with -u/--uid diff --git a/completions/valgrind b/completions/valgrind index 0370986d890..d7e3c2600c9 100644 --- a/completions/valgrind +++ b/completions/valgrind @@ -2,8 +2,8 @@ _valgrind() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local i # Note: intentionally using COMP_WORDS and COMP_CWORD instead of diff --git a/completions/vipw b/completions/vipw index 2f7828ab0db..2b4d1a1754e 100644 --- a/completions/vipw +++ b/completions/vipw @@ -2,8 +2,8 @@ _vipw() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | -!(-*)h) diff --git a/completions/vmstat b/completions/vmstat index f487b4a1b48..f6547554a17 100644 --- a/completions/vmstat +++ b/completions/vmstat @@ -2,8 +2,8 @@ _vmstat() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version | --partition | -!(-*)[hVcMNnwp]) diff --git a/completions/vncviewer b/completions/vncviewer index 364fe9a5c19..c392ca49f15 100644 --- a/completions/vncviewer +++ b/completions/vncviewer @@ -11,15 +11,15 @@ _vncviewer_bootstrap() # Install real completion for subsequent completions complete -F $fname vncviewer - $fname # Generate completions once for now + $fname "$@" # Generate completions once for now unset -f _vncviewer_bootstrap } && complete -F _vncviewer_bootstrap vncviewer _tightvncviewer() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -passwd) @@ -52,8 +52,8 @@ _tightvncviewer() # Preferred case is taken from -help. _xvnc4viewer() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return # Both single dash (-) and double dash (--) are allowed as option prefix local opt=${prev/#--/-} diff --git a/completions/vpnc b/completions/vpnc index d0a14df6bef..8edf5f39c1c 100644 --- a/completions/vpnc +++ b/completions/vpnc @@ -2,8 +2,8 @@ _vpnc() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --long-help | --version | --id | --username | --domain | \ diff --git a/completions/watch b/completions/watch index c4f308d5c4f..50bca772621 100644 --- a/completions/watch +++ b/completions/watch @@ -4,8 +4,8 @@ _watch() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local offset=0 i for ((i = 1; i <= cword; i++)); do diff --git a/completions/webmitm b/completions/webmitm index c89e31bd597..388d3123774 100644 --- a/completions/webmitm +++ b/completions/webmitm @@ -2,8 +2,8 @@ _webmitm() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur")) diff --git a/completions/wget b/completions/wget index 5083e7056e7..66952a5d1bb 100644 --- a/completions/wget +++ b/completions/wget @@ -2,8 +2,8 @@ _wget() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --version | --help | -!(-*)[hV]) diff --git a/completions/wine b/completions/wine index 69343c405ea..dee10710c58 100644 --- a/completions/wine +++ b/completions/wine @@ -2,8 +2,8 @@ _wine() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --version) diff --git a/completions/withlist b/completions/withlist index d573ca6d146..354e160c740 100644 --- a/completions/withlist +++ b/completions/withlist @@ -2,8 +2,8 @@ _withlist() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '--lock --interactive --run --all --quiet diff --git a/completions/wodim b/completions/wodim index 1d6d23bc17c..97d1949279a 100644 --- a/completions/wodim +++ b/completions/wodim @@ -2,8 +2,8 @@ _cdrecord() { - local cur prev words cword - _comp_initialize -n = || return + local cur prev words cword comp_args + _comp_initialize -n = -- "$@" || return local generic_options track_options track_mode diff --git a/completions/wol b/completions/wol index 6bfd8f68471..c2f3c54811a 100644 --- a/completions/wol +++ b/completions/wol @@ -2,8 +2,8 @@ _wol() { - local cur prev words cword split - _comp_initialize -s -n : || return + local cur prev words cword split comp_args + _comp_initialize -s -n : -- "$@" || return case $prev in --version | --help | --port | --passwd | --wait | -!(-*)[Vpw]) diff --git a/completions/wsimport b/completions/wsimport index 627f0aaded9..2b3020475e9 100644 --- a/completions/wsimport +++ b/completions/wsimport @@ -2,8 +2,8 @@ _wsimport() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return case $prev in -help | -version | -B | -p | -wsdllocation) diff --git a/completions/wtf b/completions/wtf index 833a201bb1b..9e3af6840fa 100644 --- a/completions/wtf +++ b/completions/wtf @@ -3,8 +3,8 @@ _wtf() { - local cur prev words cword addf - _comp_initialize || return + local cur prev words cword comp_args addf + _comp_initialize -- "$@" || return [[ $prev == -f ]] && _filedir && return [[ ${words[*]} == *\ -f* ]] && addf= || addf=-f diff --git a/completions/wvdial b/completions/wvdial index 37075f4f199..fb1dacea7c2 100644 --- a/completions/wvdial +++ b/completions/wvdial @@ -2,8 +2,8 @@ _wvdial() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --config) diff --git a/completions/xdg-mime b/completions/xdg-mime index 6b904d8d1cd..03e36c04cbe 100644 --- a/completions/xdg-mime +++ b/completions/xdg-mime @@ -9,8 +9,8 @@ _xdg_mime_mimetype() _xdg_mime() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local args _count_args diff --git a/completions/xdg-settings b/completions/xdg-settings index 9bac11ef683..4bf8c50bc20 100644 --- a/completions/xdg-settings +++ b/completions/xdg-settings @@ -2,8 +2,8 @@ _xdg_settings() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --help | --list | --manual | --version) diff --git a/completions/xev b/completions/xev index 06663a67d2f..9e6848f48fd 100644 --- a/completions/xev +++ b/completions/xev @@ -2,8 +2,8 @@ _comp_cmd_xev() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -display | -geometry | -bw | -id | -name) diff --git a/completions/xfreerdp b/completions/xfreerdp index 0a7ca9ee1ce..d499da5f4ff 100644 --- a/completions/xfreerdp +++ b/completions/xfreerdp @@ -2,8 +2,8 @@ _xfreerdp() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return case $prev in -k) diff --git a/completions/xgamma b/completions/xgamma index ca3d976299e..fee1e838a44 100644 --- a/completions/xgamma +++ b/completions/xgamma @@ -2,8 +2,8 @@ _xgamma() { - local cur prev words cword - _comp_initialize -n : || return + local cur prev words cword comp_args + _comp_initialize -n : -- "$@" || return case "$prev" in -screen) diff --git a/completions/xhost b/completions/xhost index bb70f002f3b..b0b3071557b 100644 --- a/completions/xhost +++ b/completions/xhost @@ -2,8 +2,8 @@ _xhost() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $cur in +*) _known_hosts_real -p+ -- "${cur:1}" ;; diff --git a/completions/xmllint b/completions/xmllint index 2c2de8907f7..c4089e45297 100644 --- a/completions/xmllint +++ b/completions/xmllint @@ -2,8 +2,8 @@ _xmllint() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -o | --output) diff --git a/completions/xmlwf b/completions/xmlwf index 4dcce9b2c03..0f720c06f2f 100644 --- a/completions/xmlwf +++ b/completions/xmlwf @@ -2,8 +2,8 @@ _xmlwf() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -*d) diff --git a/completions/xmms b/completions/xmms index 10e9bcf069e..56c127700a4 100644 --- a/completions/xmms +++ b/completions/xmms @@ -2,8 +2,8 @@ _xmms() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --help | --version | -!(-*)[hv]) diff --git a/completions/xmodmap b/completions/xmodmap index e900198e644..4b0d141224c 100644 --- a/completions/xmodmap +++ b/completions/xmodmap @@ -2,8 +2,8 @@ _xmodmap() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -display | -e) diff --git a/completions/xrandr b/completions/xrandr index 88a2c0f7234..4d6356a0e4d 100644 --- a/completions/xrandr +++ b/completions/xrandr @@ -43,8 +43,8 @@ _comp_cmd_xrandr_help() _xrandr() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local i output for ((i = cword - 1; i > 0; i--)); do diff --git a/completions/xrdb b/completions/xrdb index 6ee0c39538d..247be15cb15 100644 --- a/completions/xrdb +++ b/completions/xrdb @@ -2,8 +2,8 @@ _xrdb() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -backup | -display | -help) diff --git a/completions/xsltproc b/completions/xsltproc index cf933aa5f05..d77f86f6a88 100644 --- a/completions/xsltproc +++ b/completions/xsltproc @@ -2,8 +2,8 @@ _xsltproc() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in --output | -o) diff --git a/completions/xvfb-run b/completions/xvfb-run index 5626f89b742..7c6d5e347f9 100644 --- a/completions/xvfb-run +++ b/completions/xvfb-run @@ -2,8 +2,8 @@ _xvfb_run() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local i for ((i = 1; i <= COMP_CWORD; i++)); do diff --git a/completions/xxd b/completions/xxd index 709ec8ea1f2..a76949c9a69 100644 --- a/completions/xxd +++ b/completions/xxd @@ -2,8 +2,8 @@ _xxd() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h | -help | -c | -cols | -g | -groupsize | -l | -len | -s | -seek | \ diff --git a/completions/xz b/completions/xz index c60d6b1a6cf..d17f5179800 100644 --- a/completions/xz +++ b/completions/xz @@ -2,8 +2,8 @@ _xz() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return local xspec="*.@(xz|lzma|txz|tlz)" diff --git a/completions/xzdec b/completions/xzdec index a9636e0fb15..2228f2426c3 100644 --- a/completions/xzdec +++ b/completions/xzdec @@ -2,8 +2,8 @@ _xzdec() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in --memory | -!(-*)M) diff --git a/completions/ypmatch b/completions/ypmatch index 085da139325..3a6a7fa8de5 100644 --- a/completions/ypmatch +++ b/completions/ypmatch @@ -2,8 +2,8 @@ _ypmatch() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local map cmd=${1##*/} diff --git a/completions/yum-arch b/completions/yum-arch index 5c975081189..caae7a509e5 100644 --- a/completions/yum-arch +++ b/completions/yum-arch @@ -2,8 +2,8 @@ _yum_arch() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return if [[ $cur == -* ]]; then COMPREPLY=($(compgen -W '-d -v -vv -n -c -z -s -l -q' -- "$cur")) diff --git a/completions/zopfli b/completions/zopfli index 8b18ad9dcb9..ad414464ef8 100644 --- a/completions/zopfli +++ b/completions/zopfli @@ -2,8 +2,8 @@ _zopfli() { - local cur prev words cword - _comp_initialize || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return case $prev in -h) diff --git a/completions/zopflipng b/completions/zopflipng index d2fb86a5edb..fa779fa4c11 100644 --- a/completions/zopflipng +++ b/completions/zopflipng @@ -2,8 +2,8 @@ _zopflipng() { - local cur prev words cword split - _comp_initialize -s || return + local cur prev words cword split comp_args + _comp_initialize -s -- "$@" || return case $prev in -h | --help) diff --git a/test/t/unit/Makefile.am b/test/t/unit/Makefile.am index c240bfafa84..7530a0ed6ea 100644 --- a/test/t/unit/Makefile.am +++ b/test/t/unit/Makefile.am @@ -10,7 +10,7 @@ EXTRA_DIST = \ test_unit_find_unique_completion_pair.py \ test_unit_get_comp_words_by_ref.py \ test_unit_get_cword.py \ - test_unit_init_completion.py \ + test_unit_initialize.py \ test_unit_ip_addresses.py \ test_unit_known_hosts_real.py \ test_unit_longopt.py \ diff --git a/test/t/unit/test_unit_init_completion.py b/test/t/unit/test_unit_initialize.py similarity index 92% rename from test/t/unit/test_unit_init_completion.py rename to test/t/unit/test_unit_initialize.py index 38d1269349b..637b21bdca4 100644 --- a/test/t/unit/test_unit_init_completion.py +++ b/test/t/unit/test_unit_initialize.py @@ -14,7 +14,7 @@ def test_1(self, bash): assert_bash_exec( bash, "foo() { " - "local cur prev words cword " + "local cur prev words cword comp_args " "COMP_WORDS=() COMP_CWORD=0 COMP_LINE= COMP_POINT=0; " "_comp_initialize; }; " "foo; unset -f foo", @@ -37,7 +37,7 @@ def test_redirect(self, bash, redirect): def cmd1_empty_completion_setup(self, bash): assert_bash_exec( bash, - "_cmd1() { local cur prev words cword; _comp_initialize; } && " + '_cmd1() { local cur prev words cword comp_args; _comp_initialize -- "$@"; } && ' "complete -F _cmd1 cmd1", ) From fbc51c887e16fcc493d8678ddc2bb620fb16b62e Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Mon, 3 Oct 2022 07:33:54 +0900 Subject: [PATCH 3/4] fix(_comp_initialize): update doc comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ville Skyttä --- bash_completion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash_completion b/bash_completion index 680f8bdfce2..a3f670637e2 100644 --- a/bash_completion +++ b/bash_completion @@ -1044,7 +1044,7 @@ _comp_variable_assignments() # @var[out] words Reconstructed words # @var[out] cword Current word index in `words` # @var[out] comp_args Original arguments specified to the completion function -# are saved. +# are saved in this array, if the variable is defined. # @var[out,opt] split When "-s" is specified, `true/false` is set depending on # whether the split happened. # @return True (0) if completion needs further processing, From 356c1cbf43e0b311d449f8b691731dca8a709c6e Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Mon, 3 Oct 2022 07:40:03 +0900 Subject: [PATCH 4/4] fix(_known_hosts_real): document the exact behavior of comp_args --- bash_completion | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bash_completion b/bash_completion index a3f670637e2..2d5397096dd 100644 --- a/bash_completion +++ b/bash_completion @@ -1044,7 +1044,8 @@ _comp_variable_assignments() # @var[out] words Reconstructed words # @var[out] cword Current word index in `words` # @var[out] comp_args Original arguments specified to the completion function -# are saved in this array, if the variable is defined. +# are saved in this array, if the arguments $1...$3 is +# specified. # @var[out,opt] split When "-s" is specified, `true/false` is set depending on # whether the split happened. # @return True (0) if completion needs further processing,