Load completions in separate files dynamically, get rid of have().

bash_completion

@@ -104,15 +104,21 @@ complete -b builtin
 # start of section containing completion functions called by other functions
 
 # This function checks whether we have a given program on the system.
-# No need for bulky functions in memory if we don't.
 #
+_have()
+{
+    # Completions for system administrator commands are installed as well in
+    # case completion is attempted via `sudo command ...'.
+    PATH=$PATH:/usr/sbin:/sbin:/usr/local/sbin type $1 &>/dev/null
+}
+
+# Backwards compatibility for compat completions that use have().
+# @deprecated should no longer be used; generally not needed with dynamically
+#             loaded completions, and _have is suitable for runtime use.
 have()
 {
     unset -v have
-    # Completions for system administrator commands are installed as well in
+    _have $1 && have=yes
-    # case completion is attempted via `sudo command ...'.
-    PATH=$PATH:/usr/sbin:/sbin:/usr/local/sbin type $1 &>/dev/null &&
-    have="yes"
 }
 
 # This function checks whether a given readline variable
@@ -1691,15 +1697,12 @@ _longopt()
     fi
 }
 # makeinfo and texi2dvi are defined elsewhere.
-for i in a2ps awk base64 bash bc bison cat colordiff cp csplit \
+complete -F _longopt a2ps awk base64 bash bc bison cat colordiff cp csplit \
     cut date df diff dir du enscript env expand fmt fold gperf \
     grep grub head indent irb ld ldd less ln ls m4 md5sum mkdir mkfifo mknod \
     mv netstat nl nm objcopy objdump od paste patch pr ptx readelf rm rmdir \
     sed seq sha{,1,224,256,384,512}sum shar sort split strip sum tac tail tee \
-    texindex touch tr uname unexpand uniq units vdir wc wget who; do
+    texindex touch tr uname unexpand uniq units vdir wc wget who
-    have $i && complete -F _longopt $i
-done
-unset i
 
 declare -A _xspecs
 _filedir_xspec()
@@ -1810,7 +1813,27 @@ _install_xspec '!@(*.@(ks|jks|jceks|p12|pfx|bks|ubr|gkr|cer|crt|cert|p7b|pkipath
 _install_xspec '!*.@(mp[234c]|og[ag]|@(fl|a)ac|m4[abp]|spx|tta|w?(a)v|wma|aif?(f)|asf|ape)' kid3 kid3-qt
 unset -f _install_xspec
 
-# source completion directory definitions
+# set up dynamic completion loading
+_completion_loader()
+{
+    local compdir="${BASH_SOURCE[0]%/*}/completions"
+
+    # If full path below completions dir exists, use it.
+    if [[ $1 == */* && -f "$compdir/$1" ]]; then
+        . "$compdir/$1" &>/dev/null && return 124 || return 1
+    fi
+
+    # Special case for init.d scripts.
+    if [[ $1 == /etc?(/rc.d)/init.d/* ]]; then
+        . "$compdir/service" &>/dev/null && return 124 || return 1
+    fi
+
+    # Finally, use basename.
+    . "$compdir/${1##*/}" &>/dev/null && return 124
+} &&
+complete -D -F _completion_loader
+
+# source compat completion directory definitions
 if [[ -d $BASH_COMPLETION_COMPAT_DIR && -r $BASH_COMPLETION_COMPAT_DIR && \
     -x $BASH_COMPLETION_COMPAT_DIR ]]; then
     for i in $(LC_ALL=C command ls "$BASH_COMPLETION_COMPAT_DIR"); do
@@ -1819,15 +1842,6 @@ if [[ -d $BASH_COMPLETION_COMPAT_DIR && -r $BASH_COMPLETION_COMPAT_DIR && \
             && -f $i && -r $i ]] && . "$i"
     done
 fi
-if [[ "${BASH_SOURCE[0]%/*}/completions" != $BASH_COMPLETION_COMPAT_DIR && \
-    -d "${BASH_SOURCE[0]%/*}/completions" && -r "${BASH_SOURCE[0]%/*}/completions" && \
-    -x "${BASH_SOURCE[0]%/*}/completions" ]]; then
-    for i in $(LC_ALL=C command ls "${BASH_SOURCE[0]%/*}/completions"); do
-        i="${BASH_SOURCE[0]%/*}/completions/$i"
-        [[ ${i##*/} != @($_backup_glob|Makefile*|$_blacklist_glob) \
-            && -f $i && -r $i ]] && . "$i"
-    done
-fi
 unset i
 
 # source user completion file

completions/_mock

@@ -3,8 +3,6 @@
 
 # bash completion for mock
 
-have mock || return
-
 _mock()
 {
     local cur prev words cword split

completions/_modules

@@ -19,7 +19,7 @@
 
 # Test for existence of /etc/profile.d/modules.sh too because we may end up
 # being sourced before it and thus before the `module' alias has been defined.
-[ -f /etc/profile.d/modules.sh ] || have module || return
+[ -f /etc/profile.d/modules.sh ] || return 1
 
 _module_list ()
 {

completions/_subversion

@@ -3,8 +3,6 @@
 
 # svn completion
 
-have svn || return
-
 _svn()
 {
     local cur prev words cword

completions/_yum

@@ -3,8 +3,6 @@
 
 # yum(8) completion
 
-have yum || return
-
 _yum_list()
 {
     if [[ "$1" == all ]] ; then

completions/_yum-utils

@@ -3,8 +3,6 @@
 
 # bash completion for repomanage
 
-have repomanage || return
-
 _repomanage()
 {
     local cur prev words cword split

completions/abook

@@ -1,7 +1,5 @@
 # abook(1) completion
 
-have abook || return
-
 _abook()
 {
     local cur prev words cword

completions/ant

@@ -1,7 +1,5 @@
 # bash completion for ant and phing
 
-have ant || have phing || return
-
 _ant()
 {
     local cur prev words cword
@@ -59,9 +57,9 @@ _ant()
         COMPREPLY=( $( compgen -W '$targets' -- "$cur" ) )
     fi
 } &&
-have ant && { type complete-ant-cmd.pl &>/dev/null && \
+complete -F _ant ant phing
-    complete -C complete-ant-cmd.pl -F _ant ant || complete -F _ant ant; }
+type complete-ant-cmd.pl &>/dev/null && \
-have phing && complete -F _ant phing
+    complete -C complete-ant-cmd.pl -F _ant ant
 
 # Local variables:
 # mode: shell-script

completions/apache2ctl

@@ -1,7 +1,5 @@
 # apache2ctl(1) completion
 
-have apache2ctl || return
-
 _apache2ctl()
 {
     local cur prev words cword

completions/apt

@@ -1,6 +1,5 @@
 # Debian apt-get(8) completion.
 
-have apt-get &&
 _apt_get()
 {
     local cur prev words cword
@@ -75,7 +74,6 @@ complete -F _apt_get apt-get
 
 # Debian apt-cache(8) completion.
 #
-have apt-cache &&
 _apt_cache()
 {
     local cur prev words cword

completions/apt-build

@@ -1,7 +1,5 @@
 # Debian apt-build(1) completion.
 
-have apt-build || return
-
 _apt_build()
 {
     local cur prev words cword

completions/aptitude

@@ -1,8 +1,6 @@
 # Debian aptitude(1) completion
 
-have aptitude || return
+_have grep-status && {
-
-have grep-status && {
 _comp_dpkg_hold_packages()
 {
     grep-status -P -e "^$1" -a -FStatus 'hold' -n -s Package

completions/asciidoc

@@ -1,5 +1,3 @@
-have asciidoc || have a2x || return
-
 _asciidoc_doctype()
 {
     COMPREPLY+=( $( compgen -W 'article book manpage' -- "$cur" ) )

completions/aspell

@@ -1,7 +1,5 @@
 # bash completion for aspell
 
-have aspell || return
-
 _aspell_dictionary()
 {
     local datadir

completions/autoconf

@@ -1,6 +1,5 @@
 # Completions for autoconf tools
 
-have autoconf &&
 _autoconf()
 {
     local cur prev words cword split
@@ -38,7 +37,6 @@ _autoconf()
 } &&
 complete -F _autoconf autoconf
 
-have autoreconf || have autoheader &&
 _autoreconf()
 {
     local cur prev words cword split
@@ -77,7 +75,6 @@ _autoreconf()
 } &&
 complete -F _autoreconf autoreconf autoheader
 
-have autoscan || have autoupdate &&
 _autoscan()
 {
     local cur prev words cword split

completions/automake

@@ -1,6 +1,5 @@
 # Completions for automake tools
 
-have automake &&
 _automake()
 {
     local cur prev words cword split
@@ -34,7 +33,6 @@ _automake()
 } &&
 complete -F _automake automake automake-1.11
 
-have aclocal &&
 _aclocal()
 {
     local cur prev words cword split

completions/autorpm

@@ -1,7 +1,5 @@
 # autorpm(8) completion
 
-have autorpm || return
-
 _autorpm()
 {
     local cur prev words cword

completions/bind-utils

@@ -1,7 +1,5 @@
 # bash completion for nslookup
 
-have nslookup || have host || return
-
 _bind_queryclass()
 {
     COMPREPLY+=( $( compgen -W 'IN CH HS ANY' -- "$cur" ) )

completions/bitkeeper

@@ -1,7 +1,5 @@
 # BitKeeper completion adapted from code by  Bart Trojanowski <bart@jukie.net>
 
-have bk || return
-
 _bk()
 {
     local cur prev words cword

completions/bittorrent

@@ -1,8 +1,5 @@
 # btdownloadheadless(1) completion
 
-have btdownloadheadless.py || have btdownloadcurses.py || \
-    have btdownloadgui.py || return
-
 _btdownload()
 {
     local cur prev words cword

completions/bluez

@@ -1,7 +1,5 @@
 # bash completion for bluez utils
 
-have hcitool || return
-
 _bluetooth_adresses()
 {
     if [ -n "${COMP_BLUETOOTH_SCAN:-}" ]; then

completions/brctl

@@ -1,7 +1,5 @@
 # bash completion for brctl
 
-have brctl || return
-
 _brctl()
 {
     local cur prev words cword

completions/bzip2

@@ -1,7 +1,5 @@
 # bash completion for bzip2
 
-have bzip2 || have pbzip2 || have lbzip2 || return
-
 _bzip2()
 {
     local cur prev words cword

completions/cal

@@ -1,5 +1,3 @@
-have cal || have ncal || return
-
 _cal()
 {
     local cur prev words cword

completions/cardctl

@@ -1,7 +1,5 @@
 # Linux cardctl(8) completion
 
-have cardctl || have pccardctl || return
-
 _cardctl()
 {
     local cur prev words cword

completions/cfengine

@@ -1,7 +1,5 @@
 # bash completion for cfengine
 
-have cfagent || return
-
 _cfagent()
 {
     local cur prev words cword

completions/chkconfig

@@ -1,7 +1,5 @@
 # chkconfig(8) completion
 
-have chkconfig || return
-
 _chkconfig()
 {
     local cur prev words cword split

completions/chrpath

@@ -1,5 +1,3 @@
-have chrpath || return
-
 _chrpath()
 {
     local cur prev words cword

completions/chsh

@@ -1,7 +1,5 @@
 # chsh(1) completion
 
-have chsh || return
-
 _chsh()
 {
     local cur prev words cword

completions/cksfv

@@ -1,7 +1,5 @@
 # cksfv completion by Chris <xris@forevermore.net>
 
-have cksfv || return
-
 _cksfv()
 {
     local cur prev words cword

completions/clisp

@@ -1,8 +1,6 @@
 # bash brogrammable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
-have clisp || return
-
 _clisp()
 {
     local cur prev words cword

completions/configure

@@ -1,7 +1,5 @@
 # bash completion for configure
 
-# No "have configure" here on purpose, it's rarely in any $PATH
-
 _configure()
 {
     local cur prev words cword split

completions/coreutils

@@ -2,7 +2,6 @@
 
 # chown(1) completion
 #
-have chown &&
 _chown()
 {
     local cur prev words cword split
@@ -49,7 +48,6 @@ complete -F _chown chown
 
 # chgrp(1) completion
 #
-have chgrp &&
 _chgrp()
 {
     local cur prev words cword split
@@ -89,7 +87,6 @@ complete -F _chgrp chgrp
 
 # id(1) completion
 #
-have id &&
 _id()
 {
     local cur prev words cword
@@ -107,7 +104,6 @@ complete -F _id id
 
 # mktemp(1) completion
 #
-have mktemp &&
 _mktemp()
 {
     local cur prev words cword split

completions/cowsay

@@ -1,7 +1,5 @@
 # bash completion for cowsay
 
-have cowsay || return
-
 _cowsay()
 {
     local cur prev words cword

completions/cpan2dist

@@ -1,7 +1,5 @@
 # bash completion for cpan2dist
 
-have cpan2dist || return
-
 _cpan2dist()
 {
     local cur prev words cword

completions/cpio

@@ -1,7 +1,5 @@
 # bash completion for cpio
 
-have cpio || return
-
 _cpio_format()
 {
     COMPREPLY=( $( compgen -W 'bin odc newc crc tar ustar hpbin hpodc' -- "$cur" ) )

completions/cppcheck

@@ -1,7 +1,5 @@
 # bash completion for cppcheck(1)
 
-have cppcheck || return
-
 _cppcheck()
 {
     local cur prev words cword split

completions/crontab

@@ -1,7 +1,5 @@
 # crontab(1) completion
 
-have crontab || return
-
 _crontab()
 {
     local cur prev words cword

completions/cryptsetup

@@ -1,7 +1,5 @@
 # bash completion for cryptsetup
 
-have cryptsetup || return
-
 _cryptsetup_name()
 {
     COMPREPLY=( $( compgen -X control -W '$( command ls /dev/mapper )' \

completions/cups

@@ -1,6 +1,5 @@
 # bash completion for cups
 
-have cancel &&
 _cancel()
 {
     local cur prev words cword
@@ -10,7 +9,6 @@ _cancel()
 } &&
 complete -F _cancel cancel
 
-have lpr &&
 _lpr()
 {
     local cur prev words cword
@@ -41,7 +39,6 @@ _lpr()
 } &&
 complete -F _lpr lpr
 
-have lpq &&
 _lpq()
 {
     local cur prev words cword

completions/curl

@@ -1,5 +1,3 @@
-have curl || return
-
 _curl()
 {
     local cur prev words cword

completions/cvs

@@ -1,7 +1,5 @@
 # cvs(1) completion
 
-have cvs || return
-
 _cvs_entries()
 {
     local prefix=${cur%/*}/ IFS=$'\n'

completions/cvsps

@@ -1,7 +1,5 @@
 # bash completion for cvsps
 
-have cvsps || return
-
 _cvsps()
 {
     local cur prev words cword

completions/dd

@@ -1,7 +1,5 @@
 # bash completion for dd
 
-have dd || return
-
 _dd()
 {
     local cur prev words cword

completions/dhclient

@@ -1,7 +1,5 @@
 # bash completion for dhclient
 
-have dhclient || return
-
 _dhclient()
 {
     local cur prev words cword

completions/dict

@@ -1,7 +1,5 @@
 # dict(1) completion
 
-have dict || have rdict || return
-
 _dictdata()
 {
     dict $host $port $1 2>/dev/null | sed -ne \

completions/dot

@@ -1,7 +1,5 @@
 # dot(1) completion
 
-have dot || return
-
 _dot()
 {
     local cur prev words cword

completions/dpkg

@@ -1,6 +1,6 @@
 # This function is required by _dpkg() and _dpkg-reconfigure()
-have dpkg && {
+
-have grep-status && {
+_have grep-status && {
 _comp_dpkg_installed_packages()
 {
     grep-status -P -e "^$1" -a -FStatus 'install ok installed' -n -s Package
@@ -66,11 +66,9 @@ _dpkg()
     [[ $COMPREPLY == *= ]] && compopt -o nospace
 } &&
 complete -F _dpkg dpkg dpkg-deb
-}
 
 # Debian GNU dpkg-reconfigure(8) completion
 #
-have dpkg-reconfigure &&
 _dpkg_reconfigure()
 {
     local cur prev words cword
@@ -103,7 +101,6 @@ complete -F _dpkg_reconfigure -o default dpkg-reconfigure
 
 # Debian dpkg-source completion
 #
-have dpkg-source &&
 _dpkg_source()
 {
     local cur prev words cword

completions/dselect

@@ -1,7 +1,5 @@
 # Debian Linux dselect(8) completion.
 
-have dselect || return
-
 _dselect()
 {
     local cur prev words cword

completions/dsniff

@@ -1,6 +1,5 @@
 # dsniff util completion
 
-have arpspoof &&
 _arpspoof()
 {
     local cur prev words cword
@@ -26,7 +25,6 @@ _arpspoof()
 } &&
 complete -F _arpspoof arpspoof
 
-have dnsspoof &&
 _dnsspoof()
 {
     local cur prev words cword
@@ -50,7 +48,6 @@ _dnsspoof()
 } &&
 complete -F _dnsspoof dnsspoof
 
-have dsniff &&
 _dsniff()
 {
     local cur prev words cword
@@ -74,7 +71,6 @@ _dsniff()
 } &&
 complete -F _dsniff dsniff
 
-have filesnarf || have mailsnarf || have msgsnarf &&
 _snarf()
 {
     local cur prev words cword
@@ -94,7 +90,6 @@ _snarf()
 } &&
 complete -F _snarf filesnarf mailsnarf msgsnarf
 
-have macof &&
 _macof()
 {
     local cur prev words cword
@@ -115,7 +110,6 @@ _macof()
 } &&
 complete -F _macof macof
 
-have sshmitm &&
 _sshmitm()
 {
     local cur prev words cword
@@ -130,7 +124,6 @@ _sshmitm()
 } &&
 complete -F _sshmitm sshmitm
 
-have sshow &&
 _sshow()
 {
     local cur prev words cword
@@ -150,7 +143,6 @@ _sshow()
 } &&
 complete -F _sshow sshow
 
-have tcpkill &&
 _tcpkill()
 {
     local cur prev words cword
@@ -170,7 +162,6 @@ _tcpkill()
 } &&
 complete -F _tcpkill tcpkill
 
-have tcpnice &&
 _tcpnice()
 {
     local cur prev words cword
@@ -190,7 +181,6 @@ _tcpnice()
 } &&
 complete -F _tcpnice tcpnice
 
-have urlsnarf &&
 _urlsnarf()
 {
     local cur prev words cword
@@ -210,7 +200,6 @@ _urlsnarf()
 } &&
 complete -F _urlsnarf urlsnarf
 
-have webmitm &&
 _webmitm()
 {
     local cur prev words cword

completions/dvd+rw-tools

@@ -1,7 +1,5 @@
 # dvd+rw-tools completions
 
-have growisofs || return
-
 _growisofs()
 {
     local cur prev words cword

completions/e2fsprogs

@@ -1,6 +1,5 @@
 # bash completion for e2fsprogs
 
-have badblocks &&
 _badblocks()
 {
     local cur prev words cword
@@ -31,7 +30,6 @@ _badblocks()
 complete -F _badblocks badblocks
 
 
-have dumpe2fs &&
 _dumpe2fs()
 {
     local cur prev words cword
@@ -58,7 +56,6 @@ _dumpe2fs()
 complete -F _dumpe2fs dumpe2fs
 
 
-have e2freefrag &&
 _e2freefrag()
 {
     local cur prev words cword
@@ -81,7 +78,6 @@ _e2freefrag()
 complete -F _e2freefrag e2freefrag
 
 
-have e2label &&
 _e2label()
 {
     local cur prev words cword
@@ -95,7 +91,6 @@ _e2label()
 complete -F _e2label e2label
 
 
-have filefrag &&
 _filefrag()
 {
     local cur prev words cword
@@ -111,7 +106,6 @@ _filefrag()
 complete -F _filefrag filefrag
 
 
-have tune2fs &&
 _tune2fs()
 {
     local cur prev words cword

completions/evince

@@ -1,5 +1,3 @@
-have evince || return
-
 _evince()
 {
     local cur prev words cword split

completions/feh

@@ -1,7 +1,5 @@
 # bash completion for feh(1)
 
-have feh || return
-
 _feh()
 {
     local cur prev words cword split

completions/file

@@ -1,5 +1,3 @@
-have file || return
-
 _file()
 {
     local cur prev words cword

completions/findutils

@@ -2,8 +2,6 @@
 # globs and contains Linux specific code for completing the parameter
 # to the -fstype option.
 
-have find || return
-
 _find()
 {
     local cur prev words cword

completions/freeciv

@@ -1,6 +1,5 @@
 # freeciv completions
 
-have civserver || have freeciv-server &&
 _civserver()
 {
     local cur prev words cword
@@ -20,7 +19,6 @@ _civserver()
 } &&
 complete -F _civserver civserver freeciv-server
 
-have civclient || have freeciv-gtk2 || have freeciv-sdl || have freeciv-xaw &&
 _civclient()
 {
     local cur prev words cword

completions/freerdp

@@ -1,7 +1,5 @@
 # bash completion for xfreerdp
 
-have xfreerdp || return
-
 _xfreerdp()
 {
     local cur prev words cword

completions/fuse

@@ -1,7 +1,5 @@
 # bash completion for fuse
 
-have fusermount || return
-
 _fusermount()
 {
     local cur prev words cword

completions/gcc

@@ -8,8 +8,6 @@
 # ask the driver ("g++") for the name of the compiler ("cc1"), and parse the
 # --help output of the compiler.
 
-have gcc || return
-
 _gcc()
 {
     local cur prev words cword
@@ -49,8 +47,7 @@ _gcc()
 } &&
 complete -F _gcc gcc g++ c++ g77 gcj gpc
 
-[[ $USERLAND == GNU || $UNAME == Cygwin ]] && \
+[[ $USERLAND == GNU || $UNAME == Cygwin ]] && _have gcc && complete -F _gcc cc
-[ -n "${have:-}" ] && complete -F _gcc cc
 
 # Local variables:
 # mode: shell-script

completions/gcl

@@ -1,8 +1,6 @@
 # bash programmable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
-have gcl || return
-
 _gcl()
 {
     local cur prev words cword

completions/gdb

@@ -1,7 +1,5 @@
 # bash completion for gdb
 
-have gdb || return
-
 _gdb()
 {
     local cur prev words cword

completions/genisoimage

@@ -1,7 +1,5 @@
 # bash completion for mkisofs/genisoimage
 
-have mkisofs || have genisoimage || return
-
 _mkisofs()
 {
     local cur prev words cword

completions/getent

@@ -1,7 +1,5 @@
 # bash completion for getent
 
-have getent || return
-
 _getent()
 {
     local cur prev words cword split

completions/gkrellm

@@ -1,7 +1,5 @@
 # gkrellm(1) completion
 
-have gkrellm || have gkrellm2 || return
-
 _gkrellm()
 {
     local cur prev words cword

completions/gnatmake

@@ -1,7 +1,5 @@
 # Gnatmake completion by Ralf_Schroth@t-online.de (Ralf Schroth)
 
-have gnatmake || return
-
 _gnatmake()
 {
     local cur prev words cword

completions/gnome-mplayer

@@ -1,5 +1,3 @@
-have gnome-mplayer || return
-
 _gnome_mplayer()
 {
     local cur prev words cword split

completions/gpg

@@ -1,7 +1,5 @@
 # bash completion for gpg
 
-have gpg || return
-
 _gpg()
 {
     local cur prev words cword

completions/gpg2

@@ -1,7 +1,5 @@
 # gpg2(1) completion
 
-have gpg2 || return
-
 _gpg2()
 {
     local cur prev words cword

completions/gprof

@@ -1,5 +1,3 @@
-have gprof || return
-
 _gprof()
 {
     local cur prev words cword split

completions/gzip

@@ -1,7 +1,5 @@
 # bash completion for gzip
 
-have gzip || have pigz || return
-
 _gzip()
 {
     local cur prev words cword

completions/hddtemp

@@ -1,7 +1,5 @@
 # hddtemp(8) completion
 
-have hddtemp || return
-
 _hddtemp()
 {
     local cur prev words cword split

completions/heimdal

@@ -1,7 +1,5 @@
 # bash completion for heimdal
 
-have ktutil || return
-
 _heimdal_principals()
 {
     COMPREPLY=( $( compgen -W "$( kadmin -l dump 2>/dev/null | \

completions/hping2

@@ -1,7 +1,5 @@
 # bash completion for hping2
 
-have hping || have hping2 || have hping3 || return
-
 _hping2()
 {
     local cur prev words cword

completions/htpasswd

@@ -1,7 +1,5 @@
 # htpasswd(1) completion
 
-have htpasswd || return
-
 _htpasswd()
 {
     local cur prev words cword

completions/iconv

@@ -1,7 +1,5 @@
 # iconv(1) completion
 
-have iconv || return
-
 _iconv()
 {
     local cur prev words cword split

completions/idn

@@ -1,5 +1,3 @@
-have idn || return
-
 _idn()
 {
     local cur prev words cword split

completions/iftop

@@ -1,7 +1,5 @@
 # iftop(8) completion
 
-have iftop || return
-
 _iftop()
 {
     local cur prev words cword

completions/ifupdown

@@ -1,6 +1,6 @@
 # Red Hat & Debian GNU/Linux if{up,down} completion
 #
-[ $USERLAND = GNU ] && have ifup || have ifdown || return
+[ $USERLAND = GNU ] || return 1
 
 _ifupdown()
 {
@@ -14,9 +14,7 @@ _ifupdown()
 
     return 0
 } &&
-complete -F _ifupdown ifup ifdown
+complete -F _ifupdown ifup ifdown ifstatus
-
-have ifstatus && complete -F _ifupdown ifstatus
 
 # Local variables:
 # mode: shell-script

completions/imagemagick

@@ -1,7 +1,5 @@
 # bash completion for ImageMagick
 
-have convert || return
-
 _ImageMagick()
 {
     case $prev in

completions/info

@@ -1,7 +1,5 @@
 # bash completion for info
 
-have info || have pinfo || return
-
 _info()
 {
     local cur prev words cword split

completions/ipmitool

@@ -1,7 +1,5 @@
 # bash completion for ipmitool
 
-have ipmitool || return
-
 _ipmitool_singleline_help()
 {
     COMPREPLY=( $( compgen -W "$( $1 $2 2>&1 | \

completions/iproute2

@@ -1,7 +1,5 @@
 # iproute2 tools completion
 
-have ip || return
-
 _ip()
 {
     local cur prev words cword

completions/ipsec

@@ -1,6 +1,5 @@
 # Linux ipsec(8) completion (for FreeS/WAN and strongSwan)
 #
-have ipsec || return
 
 # Complete ipsec.conf conn entries.
 #
@@ -98,7 +97,7 @@ _ipsec_strongswan()
     return 0
 }
 
-case "$( ipsec --version )" in
+case "$( ipsec --version 2>/dev/null )" in
     *strongSwan*)
         complete -F _ipsec_strongswan ipsec
         ;;

completions/iptables

@@ -1,7 +1,5 @@
 # bash completion for iptables
 
-have iptables || return
-
 _iptables()
 {
     local cur prev words cword split

completions/iputils

@@ -1,4 +1,3 @@
-have ping || have ping6 &&
 _ping()
 {
     local cur prev words cword
@@ -58,7 +57,6 @@ _ping()
 complete -F _ping ping ping6
 
 
-have tracepath || have tracepath6 &&
 _tracepath()
 {
     local cur prev words cword
@@ -80,7 +78,6 @@ _tracepath()
 complete -F _tracepath tracepath tracepath6
 
 
-have arping &&
 _arping()
 {
     local cur prev words cword

completions/ipv6calc

@@ -1,5 +1,3 @@
-have ipv6calc || return
-
 _ipv6calc()
 {
     local cur prev words cword split

completions/isql

@@ -1,7 +1,5 @@
 # isql completion by Victor Bogado da Silva Lins <victor@bogado.net>
 
-have isql || return
-
 _isql()
 {
     local cur prev words cword

completions/jar

@@ -1,7 +1,5 @@
 # jar(1) completion
 
-have jar || return
-
 _jar()
 {
     local cur prev words cword

completions/java

@@ -1,14 +1,12 @@
 # bash completion for java, javac and javadoc
 
 # available path elements completion
-have java || have javac || have javadoc &&
 _java_path()
 {
     cur=${cur##*:}
     _filedir '@(jar|zip)'
 }
 
-have java || have javadoc && {
 # exact classpath determination
 _java_find_classpath()
 {
@@ -115,11 +113,9 @@ _java_packages()
     # convert path syntax to package syntax
     cur=${COMPREPLY[@]//\//.}
 }
-}
 
 # java completion
 #
-have java &&
 _java()
 {
     local cur prev words cword
@@ -234,7 +230,6 @@ _java()
 } &&
 complete -F _java java
 
-have javadoc &&
 _javadoc()
 {
     local cur prev words cword
@@ -276,7 +271,6 @@ _javadoc()
 } &&
 complete -F _javadoc javadoc
 
-have javac &&
 _javac()
 {
     local cur prev words cword
@@ -321,7 +315,6 @@ _javac()
 } &&
 complete -F _javac javac
 
-have pack200 &&
 _pack200()
 {
     local cur prev words cword split
@@ -394,7 +387,6 @@ _pack200()
 } &&
 complete -F _pack200 pack200
 
-have unpack200 &&
 _unpack200()
 {
     local cur prev words cword split
@@ -440,7 +432,6 @@ _unpack200()
 } &&
 complete -F _unpack200 unpack200
 
-have jarsigner &&
 _jarsigner()
 {
     local cur prev words cword
@@ -494,7 +485,6 @@ _jarsigner()
 } &&
 complete -F _jarsigner jarsigner
 
-have javaws &&
 _javaws()
 {
     local cur prev words cword
@@ -526,7 +516,6 @@ _javaws()
 } &&
 complete -F _javaws javaws
 
-have jps &&
 _jps()
 {
     local cur prev words cword

completions/k3b

@@ -1,7 +1,5 @@
 # bash completion for k3b
 
-have k3b || return
-
 _k3b()
 {
     local cur prev words cword

completions/kcov

@@ -1,5 +1,3 @@
-have kcov || return
-
 _kcov()
 {
     local cur prev words cword split

completions/kldload

@@ -1,6 +1,6 @@
 # bash completion for FreeBSD kernel module commands
 
-[ $UNAME = FreeBSD ] || return
+[ $UNAME = FreeBSD ] || return 1
 
 _kldload()
 {

completions/larch

@@ -1,7 +1,5 @@
 # larch(1) completion by Alex Shinn <foof@synthcode.com>
 
-have larch || return
-
 _larch()
 {
     local cur prev words cword

completions/ldapvi

@@ -1,7 +1,5 @@
 # bash completion for ldapvi
 
-have ldapvi || return
-
 _ldapvi()
 {
     local cur prev words cword

completions/lftp

@@ -1,6 +1,5 @@
 # bash completion for lftp
 
-have lftp &&
 _lftp()
 {
     local cur prev words cword
@@ -27,7 +26,6 @@ _lftp()
 } &&
 complete -F _lftp lftp
 
-have lftpget &&
 _lftpget()
 {
     local cur prev words cword

completions/lilo

@@ -1,7 +1,5 @@
 # bash completion for lilo(8)
 
-have lilo || return
-
 _lilo_labels()
 {
     COMPREPLY=( $( compgen -W "$( awk -F'=' '/label/ {print $2}' \

completions/links

@@ -1,7 +1,5 @@
 # bash completion for links
 
-have links || return
-
 _links()
 {
     local cur prev words cword

completions/lintian

@@ -3,8 +3,6 @@
 #
 # bash completion for lintian(1) and lintian-info(1)
 
-have lintian || return
-
 _lintian_tags()
 {
     local match search tags

completions/lisp

@@ -1,8 +1,6 @@
 # bash programmable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
-have lisp || return
-
 _lisp()
 {
     local cur prev words cword