merge with master

Makefile.am

@@ -47,7 +47,6 @@ bashcomp_DATA = contrib/ant \
 		contrib/gpg \
 		contrib/gpg2 \
 		contrib/gzip \
-		contrib/harbour \
 		contrib/heimdal \
 		contrib/iconv \
 		contrib/imagemagick \
@@ -62,7 +61,6 @@ bashcomp_DATA = contrib/ant \
 		contrib/ldapvi \
 		contrib/lftp \
 		contrib/lilo \
-		contrib/lilypond \
 		contrib/links \
 		contrib/lisp \
 		contrib/lvm \

bash_completion

@@ -144,6 +144,9 @@ complete -f -X '!*.rpm' rpm2cpio
 complete -f -X '!*.sqlite' sqlite3
 complete -f -X '!*.aux' bibtex
 complete -f -X '!*.po' poedit gtranslator kbabel lokalize
+complete -f -X '!*.@([Pp][Rr][Gg]|[Cc][Ll][Pp])' harbour gharbour hbpp
+complete -f -X '!*.[Hh][Rr][Bb]' hbrun
+complete -f -X '!*.ly' lilypond ly2dvi
 # FINISH exclude -- do not remove this line
 
 # start of section containing compspecs that can be handled within bash
@@ -228,7 +231,7 @@ quote_readline()
 # This function shell-dequotes the argument
 dequote()
 {
-	eval echo "$1"
+    eval echo "$1" 2> /dev/null
 }
 
 # Get the word to complete.
@@ -1114,7 +1117,6 @@ _ipsec()
         setup)
             COMPREPLY=( $( compgen -W '--start --stop --restart' -- "$cur" ) )
             ;;
-
         *)
             ;;
     esac
@@ -1604,8 +1606,7 @@ _filedir_xspec()
 
     COMPREPLY=( "${toks[@]}" )
 }
-list=( $( sed -ne '/^# START exclude/,/^# FINISH exclude/p' \
+list=( $( sed -ne '/^# START exclude/,/^# FINISH exclude/p' $BASH_COMPLETION | \
-	  $BASH_COMPLETION | \
     # read exclusion compspecs
     (
     while read line
@@ -1637,6 +1638,7 @@ if [ -d $BASH_COMPLETION_COMPAT_DIR -a -r $BASH_COMPLETION_COMPAT_DIR -a \
     done
 fi
 if [ -d $BASH_COMPLETION_DIR -a -r $BASH_COMPLETION_DIR -a \
+    $BASH_COMPLETION_DIR != $BASH_COMPLETION_COMPAT_DIR -a \
     -x $BASH_COMPLETION_DIR ]; then
     for i in $BASH_COMPLETION_DIR/*; do
         [[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)) ]] &&
@@ -1657,8 +1659,8 @@ unset BASH_COMPLETION_ORIGINAL_V_VALUE
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/_subversion

@@ -424,8 +424,8 @@ complete -F _svnlook $default svnlook
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/_yum

@@ -84,16 +84,14 @@ _yum()
 				cache dbcache all' -- $cur ) )
 			;;
 		repolist)
-			COMPREPLY=( $( compgen -W 'all enabled disabled' \
+			COMPREPLY=( $( compgen -W 'all enabled disabled' -- $cur ) )
-				-- $cur ) )
 			;;
 		localinstall|localupdate)
 			# TODO: should not match *src.rpm
 			_filedir rpm
 			;;
 		-d|-e)
-			COMPREPLY=( $( compgen -W '0 1 2 3 4 5 6 7 8 9 10' \
+			COMPREPLY=( $( compgen -W '0 1 2 3 4 5 6 7 8 9 10' -- $cur ) )
-				-- $cur ) )
 			;;
 		-c)
 			_filedir
@@ -102,12 +100,10 @@ _yum()
 			_filedir -d
 			;;
 		--enablerepo)
-			COMPREPLY=( $( compgen -W '$( _yum_repolist \
+			COMPREPLY=( $( compgen -W '$( _yum_repolist disabled )' -- $cur ) )
-				disabled )' -- $cur ) )
 			;;
 		--disablerepo)
-			COMPREPLY=( $( compgen -W '$( _yum_repolist \
+			COMPREPLY=( $( compgen -W '$( _yum_repolist enabled )' -- $cur ) )
-				enabled )' -- $cur ) )
 			;;
 		--disableexcludes)
 			COMPREPLY=( $( compgen -W '$( _yum_repolist all ) \
@@ -164,8 +160,7 @@ _yum_arch()
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W '-d -v -vv -n -c -z -s -l \
+			COMPREPLY=( $( compgen -W '-d -v -vv -n -c -z -s -l -q' -- $cur ) )
-				-q' -- $cur ) )
 			;;
 		*)
 			_filedir -d
@@ -178,8 +173,8 @@ complete -F _yum_arch $filenames yum-arch
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/ant

@@ -67,8 +67,8 @@ have complete-ant-cmd.pl && \
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/apache2ctl

@@ -7,7 +7,8 @@ _apache2ctl() {
     COMPREPLY=()
     cur=`_get_cword`
 
-	APWORDS=$(apache2ctl 2>&1 >/dev/null | head -n1 | cut -f3 -d" " | tr "|" " ")
+    APWORDS=$(apache2ctl 2>&1 >/dev/null | head -n1 | cut -f3 -d" " | \
+        tr "|" " ")
 
     COMPREPLY=( $( compgen -W "$APWORDS" -- "$cur" ) )
 }
@@ -16,8 +17,8 @@ complete -F _apache2ctl apache2ctl
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/apt

@@ -20,8 +20,7 @@ _apt_get()
             remove|autoremove|purge)
                 if [ -f /etc/debian_version ]; then
                     # Debian system
-				COMPREPLY=( $( _comp_dpkg_installed_packages \
+                    COMPREPLY=( $( _comp_dpkg_installed_packages $cur ) )
-						$cur ) )
                 else
                     # assume RPM based
                     _rpm_installed_packages
@@ -29,10 +28,10 @@ _apt_get()
                 return 0
                 ;;
             *)
-			COMPREPLY=( $( apt-cache --no-generate pkgnames "$cur" 2> /dev/null ) )
+                COMPREPLY=( $( apt-cache --no-generate pkgnames "$cur" \
+                    2> /dev/null ) )
                 return 0
                 ;;
-
         esac
     fi
 
@@ -41,40 +40,30 @@ _apt_get()
              _filedir
              return 0
              ;;
-
         -@(t|-target-release|-default-release))
              COMPREPLY=( $( apt-cache policy | \
                  grep "release.o=Debian,a=$cur" | \
                  sed -e "s/.*a=\(\w*\).*/\1/" | uniq 2> /dev/null) )
              return 0
              ;;
-
     esac
 
     if [[ "$cur" == -* ]]; then
-
+        COMPREPLY=( $( compgen -W '-d -f -h -v -m -q -s -y -u -t -b -c -o \
-		COMPREPLY=( $( compgen -W '-d -f -h -v -m -q -s -y \
+            --download-only --fix-broken --help --version --ignore-missing \
-				-u -t -b -c -o --download-only --fix-broken \
+            --fix-missing --no-download --quiet --simulate --just-print \
-				--help --version --ignore-missing \
+            --dry-run --recon --no-act --yes --assume-yes --show-upgraded \
-				--fix-missing --no-download --quiet --simulate \
+            --only-source --compile --build --ignore-hold --target-release \
-				--just-print --dry-run --recon --no-act --yes \
+            --no-upgrade --force-yes --print-uris --purge --reinstall \
-				--assume-yes --show-upgraded --only-source \
+            --list-cleanup --default-release --trivial-only --no-remove \
-				--compile --build --ignore-hold \
+            --diff-only --no-install-recommends --tar-only --config-file \
-				--target-release --no-upgrade --force-yes \
+            --option --auto-remove' -- "$cur" ) )
-				--print-uris --purge --reinstall \
-				--list-cleanup --default-release \
-				--trivial-only --no-remove --diff-only \
-				--no-install-recommends \
-				--tar-only --config-file --option --auto-remove' -- "$cur" ) )
     else
-
         COMPREPLY=( $( compgen -W 'update upgrade dselect-upgrade \
             dist-upgrade install remove purge source build-dep \
             check clean autoclean autoremove' -- "$cur" ) )
-
     fi
 
-
     return 0
 } &&
 complete -F _apt_get $filenames apt-get
@@ -159,8 +148,8 @@ complete -F _apt_cache $filenames apt-cache
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/apt-build

@@ -22,8 +22,7 @@ _apt_build()
                 return 0
                 ;;
             remove)
-			COMPREPLY=( $( _comp_dpkg_installed_packages \
+                COMPREPLY=( $( _comp_dpkg_installed_packages "$cur" ) )
-					"$cur" ) )
                 return 0
                 ;;
             *)
@@ -33,30 +32,25 @@ _apt_build()
     fi
 
     case "$prev" in
-
          --@(patch|build-dir|repository-dir))
                _filedir
                return 0
                ;;
-
          -@(h|-help))
                return 0
                ;;
-
     esac
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '--help --show-upgraded -u --build-dir \
-				  --repository-dir --build-only \
+            --repository-dir --build-only --build-command --reinstall \
-				  --build-command --reinstall --rebuild \
+            --rebuild --remove-builddep --no-wrapper --purge --patch \
-				  --remove-builddep --no-wrapper --purge \
+            --patch-strip -p --yes -y --version -v --no-source' -- "$cur" ) )
-				  --patch --patch-strip -p --yes -y \
-				  --version -v --no-source' -- "$cur" ) )
 
     else
-	    COMPREPLY=( $( compgen -W 'update upgrade install remove \
+        COMPREPLY=( $( compgen -W 'update upgrade install remove source \
-				  source dist-upgrade world clean info \
+            dist-upgrade world clean info clean-build update-repository' \
-				  clean-build update-repository ' -- "$cur" ) )
+            -- "$cur" ) )
     fi
 
 
@@ -66,8 +60,8 @@ complete -F _apt_build $filenames apt-build
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/aptitude

@@ -9,8 +9,7 @@ _comp_dpkg_hold_packages()
 } || {
 _comp_dpkg_hold_packages()
 {
-	grep -B 2 'hold' /var/lib/dpkg/status | grep "Package: $1" \
+    grep -B 2 'hold' /var/lib/dpkg/status | grep "Package: $1" | cut -d\  -f2
-		| cut -d\  -f2
 }
 }
 
@@ -53,7 +52,6 @@ _aptitude()
                COMPREPLY=( $( _comp_dpkg_hold_packages "$cur" ) )
                return 0
                ;;
-
        esac
     fi
 
@@ -62,32 +60,28 @@ _aptitude()
         @(autoclean|clean|forget-new|search|upgrade|safe-upgrade|update|keep-all))
             return 0
             ;;
-
         -S)
             _filedir
             return 0
             ;;
-
         -@(t|-target-release|-default-release))
             COMPREPLY=( $( apt-cache policy | \
                 grep "release.o=Debian,a=$cur" | \
                 sed -e "s/.*a=\(\w*\).*/\1/" | uniq 2> /dev/null ) )
             return 0
             ;;
-
     esac
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W "$dashoptions" -- "$cur" ) )
     else
-	    COMPREPLY=( $( compgen -W 'update upgrade safe-upgrade forget-new clean \
+        COMPREPLY=( $( compgen -W 'update upgrade safe-upgrade forget-new \
-				       autoclean install reinstall remove \
+            clean autoclean install reinstall remove \
             hold unhold purge markauto unmarkauto why why-not \
             dist-upgrade full-upgrade download search show \
             forbid-version changelog keep-all build-dep' -- "$cur" ) )
     fi
 
-
     return 0
 }
 complete -F _aptitude $default aptitude
@@ -95,8 +89,8 @@ complete -F _aptitude $default aptitude
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/aspell

@@ -91,8 +91,8 @@ complete -F _aspell $filenames aspell
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/autorpm

@@ -8,17 +8,16 @@ _autorpm()
     COMPREPLY=()
     cur=`_get_cword`
 
-	COMPREPLY=( $( compgen -W '--notty --debug --help --version \
+    COMPREPLY=( $( compgen -W '--notty --debug --help --version auto add \
-				   auto add fullinfo info help install list \
+        fullinfo info help install list remove set' -- "$cur" ) )
-				   remove set' -- "$cur" ) )
 
 } &&
 complete -F _autorpm autorpm
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/bash-builtins

@@ -12,8 +12,8 @@ _alias()
             COMPREPLY=( $( compgen -A alias -- "$cur" ) )
             ;;
         *=)
-		COMPREPLY=( "$( alias ${cur%=} 2>/dev/null | \
+            COMPREPLY=( "$( alias ${cur%=} 2>/dev/null | sed \
-			     sed -e 's|^alias '"$cur"'\(.*\)$|\1|' )" )
+                -e 's|^alias '"$cur"'\(.*\)$|\1|' )" )
             ;;
     esac
 }
@@ -59,8 +59,7 @@ _function()
         if [ "$prev" = -f ]; then
             COMPREPLY=( $( compgen -A function -- "$cur" ) )
         elif [[ "$cur" == -* ]]; then
-			COMPREPLY=( $( compgen -W '-a -f -F -i -r -x -p' -- \
+            COMPREPLY=( $( compgen -W '-a -f -F -i -r -x -p' -- "$cur" ) )
-				       "$cur" ) )
         fi
     elif [ $COMP_CWORD -eq 1 ]; then
         COMPREPLY=( $( compgen -A function -- "$cur" ) )
@@ -127,8 +126,8 @@ complete -F _complete complete
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/bind-utils

@@ -8,17 +8,16 @@ _nslookup()
     COMPREPLY=()
     cur=${COMP_WORDS[COMP_CWORD]#-}
 
-	COMPREPLY=( $( compgen -P '-' -W 'all class= debug d2 domain= \
+    COMPREPLY=( $( compgen -P '-' -W 'all class= debug d2 domain= srchlist= \
-			       srchlist= defname search port= querytype= \
+        defname search port= querytype= type= recurse retry root timeout vc \
-			       type= recurse retry root timeout vc \
         ignoretc' -- "$cur" ) )
 } &&
 complete -F _nslookup nslookup
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/bitkeeper

@@ -7,8 +7,7 @@ _bk() {
 	COMPREPLY=()
 	cur=`_get_cword`
 
-	BKCMDS="$( bk help topics | grep '^  bk' | cut -d ' ' -f 4 | \
+	BKCMDS="$( bk help topics | grep '^  bk' | cut -d ' ' -f 4 | xargs echo )"
-		   xargs echo )"
 
 	COMPREPLY=( $( compgen -W "$BKCMDS" -- "$cur" ) )
 	_filedir
@@ -19,8 +18,8 @@ complete -F _bk bk
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/bittorrent

@@ -19,17 +19,14 @@ _btdownload()
 
      if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '--max_uploads --keepalive_interval \
-				--download_slice_size --request_backlog \
+            --download_slice_size --request_backlog --max_message_length \
-				--max_message_length --ip --minport --maxport \
+            --ip --minport --maxport --responsefile --url --saveas --timeout \
-				--responsefile --url --saveas --timeout \
+            --timeout_check_interval --max_slice_length --max_rate_period \
-				--timeout_check_interval --max_slice_length \
+            --bind --upload_rate_fudge --display_interval --rerequest_interval \
-				--max_rate_period --bind --upload_rate_fudge \
+            --min_peers --http_timeout --max_initiate --max_allow_in \
-				--display_interval --rerequest_interval \
+            --check_hashes --max_upload_rate --snub_time --spew \
-				--min_peers --http_timeout --max_initiate \
+            --rarest_first_cutoff --min_uploads --report_hash_failures' \
-				--max_allow_in --check_hashes \
+            -- "$cur" ) )
-				--max_upload_rate --snub_time --spew \
-				--rarest_first_cutoff --min_uploads \
-				--report_hash_failures' -- "$cur" ) )
     else
         _filedir
     fi
@@ -38,8 +35,8 @@ complete -F _btdownload btdownloadheadless.py btdownloadcurses.py btdownloadgui.
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/bluez-utils

@@ -24,8 +24,8 @@ _bluetooth_services()
 
 _bluetooth_packet_types()
 {
-	COMPREPLY=( $( compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' -- \
+    COMPREPLY=( $( compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
-		"$cur" ) )
+        -- "$cur" ) )
 }
 
 _get_command()
@@ -87,8 +87,7 @@ _hcitool()
                 ;;
             cc)
                 if [[ "$cur" == -* ]]; then
-					COMPREPLY=( $( compgen -W '--role \
+                    COMPREPLY=( $( compgen -W '--role --pkt-type' -- "$cur" ) )
-						--pkt-type' -- "$cur" ) )
                 else
                     _count_args
                     if [ $args -eq 2 ]; then
@@ -101,8 +100,7 @@ _hcitool()
                 if [ $args -eq 2 ]; then
                     _bluetooth_adresses
                 else
-					COMPREPLY=( $( compgen -W \
+                    COMPREPLY=( $( compgen -W 'master slave' -- "$cur" ) )
-						'master slave' -- "$cur" ) )
                 fi
                 ;;
             cpt)
@@ -118,8 +116,7 @@ _hcitool()
                 if [ $args -eq 2 ]; then
                     _bluetooth_adresses
                 else
-					COMPREPLY=( $( compgen -W \
+                    COMPREPLY=( $( compgen -W '0 1' -- "$cur" ) )
-						'0 1' -- "$cur" ) )
                 fi
                 ;;
         esac
@@ -166,16 +163,14 @@ _sdptool()
                 ;;
             @(browse|records))
                 if [[ "$cur" == -* ]]; then
-					COMPREPLY=( $( compgen -W '--tree \
+                    COMPREPLY=( $( compgen -W '--tree --raw --xml' -- "$cur" ) )
-						--raw --xml' -- "$cur" ) )
                 else
                     _bluetooth_adresses
                 fi
                 ;;
             add)
                 if [[ "$cur" == -* ]]; then
-					COMPREPLY=( $( compgen -W '--handle \
+                    COMPREPLY=( $( compgen -W '--handle --channel' -- "$cur" ) )
-						--channel' -- "$cur" ) )
                 else
                     _bluetooth_services
                 fi
@@ -401,12 +396,10 @@ _hciattach()
                 ;;
             3)
                 COMPREPLY=( $( compgen -W '9600 19200 38400 \
-					57600 115200 230400 460800 921600' \
+                    57600 115200 230400 460800 921600' -- "$cur" ) )
-					-- "$cur" ) )
                 ;;
             4)
-				COMPREPLY=( $( compgen -W 'flow noflow' \
+                COMPREPLY=( $( compgen -W 'flow noflow' -- "$cur" ) )
-					-- "$cur" ) )
                 ;;
             5)
                 _bluetooth_adresses
@@ -452,8 +445,8 @@ complete -F _avctrl avctrl
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/brctl

@@ -21,8 +21,7 @@ _brctl()
                 show)
                     ;;
                 *)
-					COMPREPLY=( $( compgen -W "$(brctl \
+                    COMPREPLY=( $( compgen -W "$(brctl show | sed '1d' | \
-						show | sed '1d' | \
                         awk '{print $1}' )" -- "$cur" ) )
             esac
             ;;
@@ -42,8 +41,8 @@ complete -F _brctl $default brctl
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/bzip2

@@ -40,8 +40,8 @@ complete -F _bzip2 $filenames bzip2
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/cardctl

@@ -10,16 +10,15 @@ _cardctl()
 
     if [ $COMP_CWORD -eq 1 ]; then
         COMPREPLY=( $( compgen -W 'status config ident suspend \
-					   resume reset eject insert scheme' \
+            resume reset eject insert scheme' -- "$cur" ) )
-			       -- "$cur" ) )
     fi
 } &&
 complete -F _cardctl cardctl
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/cfengine

@@ -61,8 +61,7 @@ _cfrun()
             esac
 
             if [[ "$cur" == -* ]]; then
-				COMPREPLY=( $( compgen -W '-f -h -d -S -T -v' \
+                COMPREPLY=( $( compgen -W '-f -h -d -S -T -v' -- $cur ) )
-					-- $cur ) )
             else
                 hostfile=${CFINPUTS:-/var/lib/cfengine/inputs}/cfrun.hosts
                 for (( i=1; i < COMP_CWORD; i++ )); do
@@ -87,8 +86,8 @@ complete -F _cfrun cfrun
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/chkconfig

@@ -25,12 +25,10 @@ _chkconfig()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '--list --add --del --override \
+        COMPREPLY=( $( compgen -W '--list --add --del --override --level' -- "$cur" ) )
-						--level' -- "$cur" ) )
     else
         if [ $COMP_CWORD -eq 2 -o $COMP_CWORD -eq 4 ]; then
-			COMPREPLY=( $( compgen -W 'on off reset \
+            COMPREPLY=( $( compgen -W 'on off reset resetpriorities' -- "$cur" ) )
-						resetpriorities' -- "$cur" ) )
         else
             _services
         fi
@@ -40,8 +38,8 @@ complete -F _chkconfig chkconfig
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/chsh

@@ -20,8 +20,8 @@ complete -F _chsh chsh
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/cksfv

@@ -29,8 +29,8 @@ complete -F _cksfv cksfv
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/clisp

@@ -13,8 +13,7 @@ _clisp()
     if [[ "$cur" == -* ]]; then
     COMPREPLY=( $( compgen -W '-h --help --version --license -B -K \
         -M -m -L -N -E -q --quiet --silent -w -I -ansi \
-                     -traditional -p -C -norc -i -c -l -o -x ' \
+         -traditional -p -C -norc -i -c -l -o -x ' -- "$cur" ) )
-                     -- "$cur" ) )
     else
         _filedir
     fi
@@ -25,8 +24,8 @@ complete -F _clisp $default clisp
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/configure

@@ -12,17 +12,21 @@ _configure()
     [[ "$cur" != -* ]] && return 0
 
     if [ -n "$COMP_CONFIGURE_HINTS" ]; then
-		COMPREPLY=( $( $1 --help 2>&1 | awk '/^  --[A-Za-z]/ { print $1; if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,].*//g' | grep ^$cur ) )
+        COMPREPLY=( $( $1 --help 2>&1 | awk '/^  --[A-Za-z]/ { print $1; \
+            if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,].*//g' | \
+            grep ^$cur ) )
     else
-		COMPREPLY=( $( $1 --help 2>&1 | awk '/^  --[A-Za-z]/ { print $1; if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,=].*//g' | grep ^$cur ) )
+        COMPREPLY=( $( $1 --help 2>&1 | awk '/^  --[A-Za-z]/ { print $1; \
+            if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,=].*//g' | \
+            grep ^$cur ) )
     fi
 }
 complete -F _configure $default configure
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/cowsay

@@ -11,22 +11,22 @@ _cowsay()
 
     case $prev in
         -f)
-			COMPREPLY=( $( compgen -W '$( cowsay -l | tail -n +2 \
+            COMPREPLY=( $( compgen -W '$( cowsay -l | tail -n +2)' -- "$cur" ) )
-				)' -- "$cur" ) )
             return 0
             ;;
     esac
 
     # relevant options completion
-	COMPREPLY=( $( compgen -W '-b -d -g -p -s -t -w -y -e -f -h -l -n -T -W' -- "$cur" ) )
+    COMPREPLY=( $( compgen -W '-b -d -g -p -s -t -w -y -e -f -h -l -n -T -W' \
+        -- "$cur" ) )
 
 } &&
 complete -F _cowsay $default cowsay cowthink
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/cpan2dist

@@ -12,7 +12,9 @@ _cpan2dist()
     case $prev in
         --format)
             # should remove ":" from COMP_WORDBREAKS, but doesn't work (?)
-			COMPREPLY=( $( compgen -W '$(perl -MCPANPLUS::Dist -e "print map { \"\$_\n\" } CPANPLUS::Dist->dist_types")' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '$(perl -MCPANPLUS::Dist -e \
+                "print map { \"\$_\n\" } CPANPLUS::Dist->dist_types")' \
+                -- "$cur" ) )
             return 0
             ;;
         --@(banlist|ignorelist|modulelist|logfile))
@@ -32,7 +34,8 @@ _cpan2dist()
     else
         cpandirs=( "$HOME/.cpanplus/" "$HOME/.cpan/source/modules/" )
         for dir in ${cpandirs[@]}; do
-			[ -d "$dir" -a -r "$dir/02packages.details.txt.gz" ] && packagelist="$dir/02packages.details.txt.gz"
+            [ -d "$dir" -a -r "$dir/02packages.details.txt.gz" ] && \
+                packagelist="$dir/02packages.details.txt.gz"
         done
         COMPREPLY=( $( zgrep "^${cur//-/::}" \
             $packagelist 2>/dev/null \
@@ -43,8 +46,8 @@ complete -F _cpan2dist $default cpan2dist
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/cpio

@@ -94,8 +94,8 @@ complete -F _cpio cpio
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/cups

@@ -14,8 +14,8 @@ complete -F _cancel $filenames cancel
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/cvs

@@ -119,8 +119,7 @@ _cvs()
                     for i in "${entries[@]}"; do
                         files=( ${files[@]/#$i//} )
                     done
-				COMPREPLY=( $( compgen -X '*~' -W '${files[@]}' -- \
+                    COMPREPLY=( $( compgen -X '*~' -W '${files[@]}' -- $cur ) )
-					       $cur ) )
                 fi
             else
                 COMPREPLY=( $( compgen -W '-k -m' -- "$cur" ) )
@@ -128,10 +127,8 @@ _cvs()
             ;;
         admin)
             if [[ "$cur" = -* ]]; then
-			COMPREPLY=( $( compgen -W '-i -a -A -e -b -c -k -l -u \
+                COMPREPLY=( $( compgen -W '-i -a -A -e -b -c -k -l -u -L -U -m -M \
-						   -L -U -m -M -n -N -o -q -I \
+                    -n -N -o -q -I -s -t -t- -T -V -x -z' -- $cur ) )
-						   -s -t -t- -T -V -x -z' -- \
-					$cur ) )
             fi
             ;;
         annotate)
@@ -175,8 +172,7 @@ _cvs()
                     COMPREPLY=( $(compgen $default -- "$cur") )
                 fi
             else
-			COMPREPLY=( $( compgen -W '-n -R -l -f -F -m -r' -- \
+                COMPREPLY=( $( compgen -W '-n -R -l -f -F -m -r' -- $cur ) )
-				       $cur ) )
             fi
             ;;
         cvsroot)
@@ -192,8 +188,8 @@ _cvs()
                 COMPREPLY=( $( cvs -d "$cvsroot" co -c | awk '{print $1}' ) )
                 COMPREPLY=( $( compgen -W '${COMPREPLY[@]}' -- "$cur" ) )
             else
-			COMPREPLY=( $( compgen -W '-N -f -l -R -n \
+                COMPREPLY=( $( compgen -W '-N -f -l -R -n -r -D -d -k' \
-						  -r -D -d -k' -- "$cur" ) )
+                    -- "$cur" ) )
             fi
             ;;
         diff)
@@ -231,8 +227,7 @@ _cvs()
                 fi
                 pwd=$( pwd )
                 pwd=${pwd##*/}
-			COMPREPLY=( $( compgen -W '${COMPREPLY[@]} $pwd' -- \
+                COMPREPLY=( $( compgen -W '${COMPREPLY[@]} $pwd' -- $cur ) )
-				       $cur ) )
             else
                 COMPREPLY=( $( compgen -W '-d -k -I -b -m -W' -- "$cur" ))
             fi
@@ -240,8 +235,7 @@ _cvs()
         update)
             if [[ "$cur" = -* ]]; then
                 COMPREPLY=( $( compgen -W '-A -P -C -d -f -l -R -p \
-						   -k -r -D -j -I -W' -- \
+                    -k -r -D -j -I -W' -- "$cur" ) )
-						   "$cur" ) )
             fi
             ;;
         "")
@@ -265,8 +259,8 @@ complete -F _cvs $default cvs
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/dcop

@@ -12,14 +12,15 @@ _dcop()
     else
         compstr=$( command echo ${COMP_WORDS[*]} | sed "s/ $cur$//" )
     fi
-	COMPREPLY=( $( compgen -W '$( command $compstr | sed s/\(.*\)// )'  -- "$cur" ) )
+    COMPREPLY=( $( compgen -W '$( command $compstr | sed s/\(.*\)// )'  \
+        -- "$cur" ) )
 } &&
 complete -F _dcop dcop
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/dd

@@ -17,8 +17,7 @@ _dd()
     conv=*)
         cur=${cur#*=}
         COMPREPLY=( $( compgen -W 'ascii ebcdic ibm block unblock \
-				lcase notrunc ucase swab noerror sync' \
+            lcase notrunc ucase swab noerror sync' -- "$cur" ) )
-				-- "$cur" ) )
         return 0
         ;;
     esac
@@ -33,8 +32,8 @@ complete -F _dd $nospace $filenames dd
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/dhclient

@@ -30,8 +30,8 @@ complete -F _dhclient dhclient
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/dict

@@ -71,8 +71,8 @@ complete -F _dict $default dict rdict
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/dpkg

@@ -61,7 +61,6 @@ _dpkg()
             return 0
             ;;
         *)
-
             COMPREPLY=( $( compgen -W '-i --install --unpack -A --record-avail \
                 --configure -r --remove -P --purge --get-selections \
                 --set-selections --update-avail --merge-avail \
@@ -122,9 +121,8 @@ _dpkg_reconfigure()
     esac
 
     if [[ "$cur" == -* ]]; then
-	    COMPREPLY=( $( compgen -W '-f --frontend -p --priority -a --all \
+        COMPREPLY=( $( compgen -W '-f --frontend -p --priority -a --all -u \
-				       -u --unseen-only -h --help -s --showold \
+            --unseen-only -h --help -s --showold --force --terse' -- "$cur" ) )
-				       --force --terse' -- "$cur" ) )
     else
         COMPREPLY=( $( _comp_dpkg_installed_packages "$cur" ) )
     fi
@@ -263,8 +261,8 @@ complete -F _dpkg_source dpkg-source
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/dselect

@@ -14,7 +14,6 @@ _dselect()
             _filedir -d
             return 0
             ;;
-
         -@(D|debug))
             _filedir
             return 0
@@ -36,8 +35,8 @@ complete -F _dselect $filenames dselect
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/dsniff

@@ -83,8 +83,7 @@ _dsniff()
     esac
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '-c -d -m -n -i -s -f -t \
+        COMPREPLY=( $( compgen -W '-c -d -m -n -i -s -f -t -r -w' -- "$cur" ) )
-			-r -w' -- "$cur" ) )
     fi
 
 } &&
@@ -281,8 +280,8 @@ complete -F _webmitm webmitm
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/findutils

@@ -23,7 +23,8 @@ _find()
     -fstype)
         # this is highly non-portable
         [ -e /proc/filesystems ] &&
-		COMPREPLY=( $( compgen -W "$( cut -d$'\t' -f2 /proc/filesystems )" -- "$cur" ) )
+            COMPREPLY=( $( compgen -W "$( cut -d$'\t' -f2 /proc/filesystems )" \
+            -- "$cur" ) )
         return 0
         ;;
     -gid)
@@ -114,8 +115,8 @@ complete -F _find $filenames find
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/freeciv

@@ -19,8 +19,7 @@ _civserver()
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '-d -f -g -h -i -l -m -M -p -q -r -v\
             --debug --file --gamelog --help --info --log --meta \
-			--Metaserver --port --quitidle --read --version' \
+            --Metaserver --port --quitidle --read --version' -- "$cur" ) )
-			-- "$cur" ) )
     fi
 
 } &&
@@ -54,9 +53,8 @@ _civclient()
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '-a -d -h -l -m -n -p -P -s -S -t -v\
-			--autoconnect --debug --help --log --meta --name \
+            --autoconnect --debug --help --log --meta --name --port \
-			--port --Plugin --server --Sound --tiles --version' \
+            --Plugin --server --Sound --tiles --version' -- "$cur" ) )
-			-- "$cur" ) )
     fi
 
 } &&
@@ -64,8 +62,8 @@ complete -F _civclient civclient
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/gcc

@@ -52,8 +52,8 @@ complete $filenames -F _gcc gcc g++ c++ g77 gcj gpc
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/gcl

@@ -12,8 +12,7 @@ _gcl()
     # completing an option (may or may not be separated by a space)
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '-eval -load -f -batch -dir -libdir \
-                     -compile -o-file -c-file -h-file -data-file -system-p '\
+            -compile -o-file -c-file -h-file -data-file -system-p '-- "$cur" ) )
-                     -- "$cur" ) )
     else
         _filedir
     fi
@@ -24,8 +23,8 @@ complete -F _gcl $default gcl
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/gdb

@@ -23,22 +23,21 @@ _gdb()
             local path_array=( $(echo "$PATH" | sed 's/::\+/:/g;s/^:\|:$//g') )
             IFS=$'\n'
             COMPREPLY=( $( compgen -d -W '$(find "${path_array[@]}" . \
-				-mindepth 1 -maxdepth 1 -not -type d -executable -printf "%f\\n" 2>/dev/null)' \
+                -mindepth 1 -maxdepth 1 -not -type d -executable \
-				-- "$cur" ) )
+                -printf "%f\\n" 2>/dev/null)' -- "$cur" ) )
         fi
     elif [ $COMP_CWORD -eq 2 ]; then
         prev=${prev##*/}
         COMPREPLY=( $( compgen -fW "$( command ps axo comm,pid | \
-				awk '{if ($1 ~ /^'"$prev"'/) print $2}' )" \
+            awk '{if ($1 ~ /^'"$prev"'/) print $2}' )" -- "$cur" ) )
-				-- "$cur" ) )
     fi
 } &&
 complete -F _gdb $default gdb
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/genisoimage

@@ -72,8 +72,8 @@ complete -F _mkisofs $filenames mkisofs genisoimage
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/getent

@@ -40,18 +40,17 @@ _getent()
 
 
     if [ $COMP_CWORD -eq 1 ]; then
-		COMPREPLY=( $( compgen -W 'passwd group hosts services \
+        COMPREPLY=( $( compgen -W 'passwd group hosts services protocols \
-					   protocols networks ahosts ahostsv4 \
+            networks ahosts ahostsv4 ahostsv6 aliases ethers netgroup rpc \
-					   ahostsv6 aliases ethers netgroup \
+            shadow' -- "$cur" ) )
-					   rpc shadow' -- "$cur" ) )
     fi
 } &&
 complete -F _getent getent
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/gkrellm

@@ -27,8 +27,7 @@ _gkrellm()
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '--help -t --theme -s --server \
             -g --geometry -wm -w --withdrawn -c --config -nc \
-			-f --force-host-config -demo -p --plugin -P \
+            -f --force-host-config -demo -p --plugin -P --port' -- "$cur" ) )
-			--port' -- "$cur" ) )
     fi
 
 } &&
@@ -36,8 +35,8 @@ complete -F _gkrellm gkrellm gkrellm2
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/gnatmake

@@ -24,15 +24,14 @@ _gnatmake()
     else
         # source file completion
         _filedir '@(adb|ads)'
-
     fi
 } &&
 complete -F _gnatmake $filenames gnatmake
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/gpg

@@ -16,13 +16,17 @@ _gpg()
             ;;
         --@(export|@(?(l|nr|nrl)sign|edit)-key))
             # return list of public keys
-		COMPREPLY=( $( compgen -W "$( gpg --list-keys 2>/dev/null | sed -ne 's@^pub.*/\([^ ]*\).*$@\1@p;s@^.*\(<\([^>]*\)>\).*$@\2@p')" -- "$cur" ))
+            COMPREPLY=( $( compgen -W "$( gpg --list-keys 2>/dev/null | \
+                sed -ne 's@^pub.*/\([^ ]*\).*$@\1@p;s@^.*\(<\([^>]*\)>\).*$@\2@p')" -- "$cur" ))
             return 0
             ;;
         -@(r|-recipient))
-		COMPREPLY=( $( compgen -W "$( gpg --list-keys 2>/dev/null | sed -ne 's@^.*<\([^>]*\)>.*$@\1@p')" -- "$cur" ))
+            COMPREPLY=( $( compgen -W "$( gpg --list-keys 2>/dev/null | \
+                sed -ne 's@^.*<\([^>]*\)>.*$@\1@p')" -- "$cur" ))
             if [ -e ~/.gnupg/gpg.conf ]; then
-			COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$( sed -ne 's@^[ \t]*group[ \t][ \t]*\([^=]*\).*$@\1@p' ~/.gnupg/gpg.conf  )" -- "$cur") )
+                COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$( sed -ne \
+                    's@^[ \t]*group[ \t][ \t]*\([^=]*\).*$@\1@p' \
+                    ~/.gnupg/gpg.conf  )" -- "$cur") )
             fi
             return 0
         ;;
@@ -38,8 +42,8 @@ complete -F _gpg $default gpg
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/gpg2

@@ -20,13 +20,17 @@ _gpg2 ()
             ;;
         --@(export|@(?(l|nr|nrl)sign|edit)-key))
             # return list of public keys
-			COMPREPLY=( $( compgen -W "$( gpg2 --list-keys 2>/dev/null | sed -ne 's@^pub.*/\([^ ]*\).*$@\1@p;s@^.*\(<\([^>]*\)>\).*$@\2@p')" -- "$cur" ))
+            COMPREPLY=( $( compgen -W "$( gpg2 --list-keys 2>/dev/null | \
+                sed -ne 's@^pub.*/\([^ ]*\).*$@\1@p;s@^.*\(<\([^>]*\)>\).*$@\2@p')" -- "$cur" ))
             return 0
             ;;
         -@(r|-recipient))
-			COMPREPLY=( $( compgen -W "$( gpg2 --list-keys 2>/dev/null | sed -ne 's@^.*<\([^>]*\)>.*$@\1@p')" -- "$cur" ))
+            COMPREPLY=( $( compgen -W "$( gpg2 --list-keys 2>/dev/null | \
+                sed -ne 's@^.*<\([^>]*\)>.*$@\1@p')" -- "$cur" ))
             if [ -e ~/.gnupg/gpg.conf ]; then
-				COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$( sed -ne 's@^[ \t]*group[ \t][ \t]*\([^=]*\).*$@\1@p' ~/.gnupg/gpg.conf)" -- "$cur"))
+                COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$( sed -ne \
+                    's@^[ \t]*group[ \t][ \t]*\([^=]*\).*$@\1@p' \
+                    ~/.gnupg/gpg.conf)" -- "$cur"))
             fi
         return 0
         ;;
@@ -42,8 +46,8 @@ complete -F _gpg2 $default gpg2
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/gzip

@@ -11,8 +11,7 @@ _gzip()
     helpopts=`_parse_help gzip`
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W "$helpopts -2 -3 -4 -5 -6 -7 -8" \
+        COMPREPLY=( $( compgen -W "$helpopts -2 -3 -4 -5 -6 -7 -8" -- "$cur" ) )
-						-- "$cur" ) )
         return 0
     fi
 
@@ -42,8 +41,8 @@ complete -F _gzip $filenames gzip
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/harbour

@@ -1,13 +0,0 @@
-# harbour completion by Dave Pearson <davep@davep.org>
-# http://www.harbour-project.org/
-
-complete -f -X '!*.@([Pp][Rr][Gg]|[Cc][Ll][Pp])' harbour gharbour hbpp
-complete -f -X '!*.[Hh][Rr][Bb]' hbrun
-
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 8
-# sh-indent-comment: t
-# indent-tabs-mode: t
-# End:
-# ex: ts=8 sw=8 noet filetype=sh

contrib/heimdal

@@ -23,7 +23,6 @@ _heimdal_encodings()
         aes256-cts-hmac-sha1-96' -- "$cur" ) )
 }
 
-
 _ktutil()
 {
     local cur prev command options split=false
@@ -79,18 +78,15 @@ _ktutil()
     if [[ "$cur" == -* ]]; then
         case $command in
             add)
-				options='-p --principal -V -e --enctype -w \
+                options='-p --principal -V -e --enctype -w --password -r \
-					--password -r --random -s --no-salt \
+                    --random -s --no-salt -h --hex'
-					-h --hex'
             ;;
             change)
-				options='-r --realm -a --admin-server -s \
+                options='-r --realm -a --admin-server -s --server-port'
-					--server-port'
             ;;
             get)
-				options='-p --principal -e --enctype -r \
+                options='-p --principal -e --enctype -r --realm -a \
-					--realm -a --admin-server -s server \
+                    --admin-server -s server --server-port'
-					--server-port'
                 ;;
             list)
                 options='--keys --timestamp'
@@ -105,8 +101,7 @@ _ktutil()
                 options='-s --srvtab'
                 ;;
             *)
-				options='-k --keytab -v --verbose --version \
+                options='-k --keytab -v --verbose --version -v --help'
-					-v --help'
                 ;;
         esac
         COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
@@ -132,8 +127,8 @@ complete -F _ktutil ktutil
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/iconv

@@ -28,8 +28,8 @@ complete -F _iconv $default iconv
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/imagemagick

@@ -24,8 +24,7 @@ _ImageMagick()
         -compose)
             COMPREPLY=( $( compgen -W 'Over In Out Atop Xor Plus \
                 Minus Add Subtract Difference Multiply Bumpmap\
-				Copy CopyRed CopyGreen CopyBlue CopyOpacity' \
+                Copy CopyRed CopyGreen CopyBlue CopyOpacity' -- "$cur" ) )
-				-- "$cur" ) )
             return 0
             ;;
         -compress)
@@ -34,8 +33,8 @@ _ImageMagick()
             return 0
             ;;
         -dispose)
-			COMPREPLY=( $( compgen -W 'Undefined None Background \
+            COMPREPLY=( $( compgen -W 'Undefined None Background Previous' \
-						    Previous' -- "$cur" ) )
+                -- "$cur" ) )
             return 0
             ;;
         -encoding)
@@ -51,21 +50,18 @@ _ImageMagick()
         -filter)
             COMPREPLY=( $( compgen -W 'Point Box Triangle Hermite \
                 Hanning Hamming Blackman Gaussian Quadratic \
-				Cubic Catrom Mitchell Lanczos Bessel Sinc' \
+                Cubic Catrom Mitchell Lanczos Bessel Sinc' -- "$cur" ) )
-				-- "$cur" ) )
             return 0
             ;;
         -format)
             COMPREPLY=( $( compgen -W "$( convert -list format | \
                 awk '/ [r-][w-][+-] / {print $1}' | \
-				    tr -d '*' | tr [:upper:] [:lower:] )" \
+                tr -d '*' | tr [:upper:] [:lower:] )" -- "$cur" ) )
-				    -- "$cur" ) )
             return 0
             ;;
         -gravity)
             COMPREPLY=( $( compgen -W 'Northwest North NorthEast \
-				West Center East SouthWest South SouthEast' \
+                West Center East SouthWest South SouthEast' -- "$cur" ) )
-				-- "$cur" ) )
             return 0
             ;;
         -intent)
@@ -74,29 +70,26 @@ _ImageMagick()
             return 0
             ;;
         -interlace)
-			COMPREPLY=( $( compgen -W 'None Line Plane Partition' \
+            COMPREPLY=( $( compgen -W 'None Line Plane Partition' -- "$cur" ) )
-					-- "$cur" ) )
             return 0
             ;;
         -limit)
-			COMPREPLY=( $( compgen -W 'Disk File Map Memory' \
+            COMPREPLY=( $( compgen -W 'Disk File Map Memory' -- "$cur" ) )
-					-- "$cur" ) )
             return 0
             ;;
         -list)
-			COMPREPLY=( $( compgen -W 'Delegate Format Magic \
+            COMPREPLY=( $( compgen -W 'Delegate Format Magic Module Resource \
-					Module Resource Type' -- "$cur" ) )
+                Type' -- "$cur" ) )
             return 0
             ;;
         -map)
-			COMPREPLY=( $( compgen -W 'best default gray red \
+            COMPREPLY=( $( compgen -W 'best default gray red green blue' \
-					green blue' -- "$cur" ) )
+                -- "$cur" ) )
             _filedir
             return 0
             ;;
         -noise)
-			COMPREPLY=( $( compgen -W 'Uniform Gaussian \
+            COMPREPLY=( $( compgen -W 'Uniform Gaussian Multiplicative \
-					Multiplicative \
                 Impulse Laplacian Poisson' -- "$cur" ) )
             return 0
             ;;
@@ -107,8 +100,7 @@ _ImageMagick()
                 ReduceNoise AddNoise Sharpen Blur \
                 Treshold EdgeDetect Spread Shade \
                 Raise Segment Solarize Swirl Implode \
-					Wave OilPaint CharcoalDrawing JPEG' \
+                Wave OilPaint CharcoalDrawing JPEG' -- "$cur" ) )
-					-- "$cur" ) )
             return 0
             ;;
         -@(mask|profile|texture|tile|write))
@@ -116,9 +108,8 @@ _ImageMagick()
             return 0
             ;;
         -type)
-			COMPREPLY=( $( compgen -W 'Bilevel Grayscale Palette \
+            COMPREPLY=( $( compgen -W 'Bilevel Grayscale Palette PaletteMatte \
-					PaletteMatte TrueColor TrueColorMatte \
+                TrueColor TrueColorMatte ColorSeparation ColorSeparationlMatte \
-					ColorSeparation ColorSeparationlMatte \
                 Optimize' -- "$cur" ) )
             return 0
             ;;
@@ -128,14 +119,12 @@ _ImageMagick()
             return 0
             ;;
         -virtual-pixel)
-			COMPREPLY=( $( compgen -W 'Constant Edge mirror tile' \
+            COMPREPLY=( $( compgen -W 'Constant Edge mirror tile' -- "$cur" ) )
-					-- "$cur" ) )
             return 0
             ;;
         -visual)
-			COMPREPLY=( $( compgen -W 'StaticGray GrayScale \
+            COMPREPLY=( $( compgen -W 'StaticGray GrayScale StaticColor \
-					StaticColor PseudoColor TrueColor \
+                PseudoColor TrueColor DirectColor defaut visualid' -- "$cur" ))
-					DirectColor defaut visualid' -- "$cur" ))
             return 0
             ;;
     esac
@@ -324,7 +313,8 @@ _animate()
             -trim -verbose -version -virtual-pixel -visual \
             -window' -- "$cur" ) )
     elif [[ "$cur" == +* ]]; then
-		COMPREPLY=( $( compgen -W '+debug +dither +gamma +map +matte' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '+debug +dither +gamma +map +matte' \
+            -- "$cur" ) )
     else
         _filedir
     fi
@@ -466,9 +456,8 @@ _conjure()
     _ImageMagick
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '-debug -help -list -log -monitor \
+        COMPREPLY=( $( compgen -W '-debug -help -list -log -monitor -quiet \
-			-quiet -regard-warnings -seed -verbose \
+            -regard-warnings -seed -verbose -version' -- "$cur" ) )
-			-version' -- "$cur" ) )
     elif [[ "$cur" == +* ]]; then
         COMPREPLY=( $( compgen -W '+debug' -- "$cur" ) )
     else
@@ -536,8 +525,8 @@ complete -F _stream $filenames stream
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/info

@@ -51,8 +51,8 @@ complete -F _info $filenames info
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/ipmitool

@@ -11,8 +11,7 @@ _ipmitool()
 
     case "$prev" in
         -I)
-			COMPREPLY=( $( compgen -W 'open imb lan lanplus free' \
+            COMPREPLY=( $( compgen -W 'open imb lan lanplus free' -- "$cur" ) )
-				-- "$cur" ) )
             return 0
             ;;
     esac
@@ -20,8 +19,7 @@ _ipmitool()
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '-h -V -v -c -d -I -H -p -U -f -S -a \
-			-e -C -k -y -K -A -P -E -K -m -b -r -B -T -l -o -O' \
+            -e -C -k -y -K -A -P -E -K -m -b -r -B -T -l -o -O' -- "$cur" ) )
-			-- "$cur" ) )
     else
         COMPREPLY=( $( compgen -W 'raw i2c spd lan chassis power event \
             mc sdr sensor fru gendev sel pef sol tsol isol user \
@@ -34,8 +32,8 @@ complete -F _ipmitool ipmitool
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/iptables

@@ -63,8 +63,8 @@ complete -F _iptables iptables
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/isql

@@ -6,14 +6,15 @@ _isql()
     local cur
     cur=`_get_cword`
 
-	[ -f "$ODBCINI" ] && COMPREPLY=( $( grep \\["$cur" "$ODBCINI" | tr -d \\[\\] ) )
+    [ -f "$ODBCINI" ] \
+        && COMPREPLY=( $( grep \\["$cur" "$ODBCINI" | tr -d \\[\\] ) )
 } &&
 complete -F _isql isql
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/jar

@@ -29,8 +29,8 @@ complete -F _jar $filenames jar
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/java

@@ -208,8 +208,7 @@ _javadoc()
             -nosince -nodeprecatedlist -notree -noindex \
             -nohelp -nonavbar -quiet -serialwarn -tag \
             -taglet -tagletpath -charset -helpfile \
-				-linksource -stylesheetfile -docencoding' -- \
+            -linksource -stylesheetfile -docencoding' -- "$cur" ) )
-				"$cur" ) )
     else
         # source files completion
         _filedir java
@@ -254,8 +253,8 @@ complete -F _javac $filenames javac
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/kldload

@@ -31,8 +31,8 @@ complete -F _kldunload $filenames kldunload
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/larch

@@ -12,24 +12,28 @@ _larch()
     if [ $COMP_CWORD -eq 1 ] || [[ "$prev" == -* ]]; then
         COMPREPLY=( $( compgen -W ' \
             my-id my-default-archive register-archive whereis-archive archives \
-init-tree tree-root tree-version set-tree-version inventory tagging-method  \
+            init-tree tree-root tree-version set-tree-version inventory \
-tree-lint missing-tags add delete move explicit-default set-manifest        \
+            tagging-method tree-lint missing-tags add delete \
-manifest check-manifest mkpatch dopatch patch-report empty-patch            \
+            move explicit-default set-manifest manifest check-manifest mkpatch \
-make-archive make-category make-branch make-version categories              \
+            dopatch patch-report empty-patch make-archive make-category \
-branches versions revisions cat-archive-log archive-cache-revision          \
+            make-branch make-version categories branches versions revisions \
-archive-cached-revisions archive-uncache-revision category-readme           \
+            cat-archive-log archive-cache-revision archive-cached-revisions \
-branch-readme version-readme make-log logs add-log log-ls cat-log           \
+            archive-uncache-revision category-readme branch-readme \
-log-header-field changelog log-for-merge merge-points new-on-branch         \
+            version-readme make-log logs add-log log-ls cat-log \
-import commit get get-patch lock-branch lock-revision push-mirror           \
+            log-header-field changelog log-for-merge merge-points \
-build-config update-config replay-config record-config show-config          \
+            new-on-branch import commit get get-patch lock-branch \
-config-history update replay delta-patch star-merge tag prepare-branch      \
+            lock-revision push-mirror build-config update-config replay-config \
-finish-branch join-branch whats-missing what-changed file-diffs pristines   \
+            record-config show-config config-history update replay delta-patch \
-lock-pristine my-revision-library library-find library-add library-remove   \
+            star-merge tag prepare-branch finish-branch join-branch \
-library-archives library-categories library-branches library-versions       \
+            whats-missing what-changed file-diffs pristines lock-pristine \
-library-revisions library-log library-file touched-files-prereqs            \
+            my-revision-library library-find library-add library-remove \
-patch-set-web update-distributions distribution-name notify my-notifier     \
+            library-archives library-categories library-branches \
-mail-new-categories mail-new-branches mail-new-versions mail-new-revisions  \
+            library-versions library-revisions library-log library-file \
-notify-library notify-browser push-new-revisions sendmail-mailx' "$cur" ))
+            touched-files-prereqs patch-set-web update-distributions \
+            distribution-name notify my-notifier mail-new-categories \
+            mail-new-branches mail-new-versions mail-new-revisions \
+            notify-library notify-browser push-new-revisions sendmail-mailx' \
+            "$cur" ))
     fi
 
     return 0
@@ -38,8 +42,8 @@ complete -F _larch $default larch
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/ldapvi

@@ -24,8 +24,7 @@ _ldapvi()
             return 0
             ;;
         --bind-dialog)
-			COMPREPLY=( $( compgen -W 'never auto always' \
+            COMPREPLY=( $( compgen -W 'never auto always' -- $cur ) )
-				-- $cur ) )
             return 0
             ;;
         --scope)
@@ -33,13 +32,12 @@ _ldapvi()
             return 0
             ;;
         --deref)
-			COMPREPLY=( $( compgen -W 'never searching finding \
+            COMPREPLY=( $( compgen -W 'never searching finding always' \
-				always' -- "$cur" ) )
+                -- "$cur" ) )
             return 0
             ;;
         --encoding)
-			COMPREPLY=( $( compgen -W 'ASCII UTF-8 binary' \
+            COMPREPLY=( $( compgen -W 'ASCII UTF-8 binary' -- "$cur" ) )
-				-- "$cur" ) )
             return 0
             ;;
         --tls)
@@ -68,8 +66,8 @@ complete -F _ldapvi ldapvi
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/lftp

@@ -19,8 +19,8 @@ complete -F _lftp $default lftp
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/lilo

@@ -46,8 +46,7 @@ _lilo()
     if [[ "$cur" == -* ]]; then
         # relevant options completion
         COMPREPLY=( $( compgen -W '-A -b -c -C -d -f -g -i -I -l -L -m \
-			-M -p -P -q -r -R -s -S -t -T -u -U -v -V -w -x -z' -- \
+            -M -p -P -q -r -R -s -S -t -T -u -U -v -V -w -x -z' -- "$cur" ) )
-			"$cur" ) )
     fi
 }
 complete -F _lilo lilo
@@ -55,8 +54,8 @@ complete -F _lilo lilo
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/lilypond

@@ -1,11 +0,0 @@
-# lilypond completion by Laurent Martelli <laurent@bearteam.org>
-
-complete -f -X '!*.ly' lilypond ly2dvi
-
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 8
-# sh-indent-comment: t
-# indent-tabs-mode: t
-# End:
-# ex: ts=8 sw=8 noet filetype=sh

contrib/links

@@ -14,10 +14,9 @@ _links()
             ;;
         -*)
             COMPREPLY=( $( compgen -W '-async-dns -max-connections \
-				-max-connections-to-host -retries \
+                -max-connections-to-host -retries -receive-timeout \
-				-receive-timeout -unrestartable-receive-timeout\
+                -unrestartable-receive-timeout -format-cache-size \
-				-format-cache-size -memory-cache-size \
+                -memory-cache-size -http-proxy -ftp-proxy -download-dir \
-				-http-proxy -ftp-proxy -download-dir \
                 -assume-codepage -anonymous -dump -no-connect \
                 -source -version -help' -- "$cur" ) )
                 ;;
@@ -37,8 +36,8 @@ complete -F _links $filenames links
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/lisp

@@ -12,8 +12,7 @@ _lisp()
     # completing an option (may or may not be separated by a space)
     if [[ "$cur" == -* ]]; then
     COMPREPLY=( $( compgen -W '-core -lib -batch -quit -edit -eval -init \
-                     -dynamic-space-size -hinit -noinit -nositeinit -load \
+        -dynamic-space-size -hinit -noinit -nositeinit -load -slave ' \
-                     -slave ' \
         -- "$cur" ) )
     else
         _filedir
@@ -25,8 +24,8 @@ complete -F _lisp $default lisp
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/lvm

@@ -370,11 +370,10 @@ _vgcreate()
     esac
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '-A --autobackup --addtag \
+        COMPREPLY=( $( compgen -W '-A --autobackup --addtag --alloc -d \
-			--alloc -d --debug -h --help -l --maxlogicalvolumes \
+            --debug -h --help -l --maxlogicalvolumes -M --metadatatype -p \
-			-M --metadatatype -p --maxphysicalvolumes -s \
+            --maxphysicalvolumes -s --physicalextentsize -t --test -v \
-			--physicalextentsize -t --test -v --verbose \
+            --verbose --version' -- "$cur" ) )
-			--version' -- "$cur" ) )
     else
         _args
         if [ $args -eq 0 ]; then
@@ -629,9 +628,8 @@ _vgmerge()
     esac
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '-A --autobackup -d --debug \
+        COMPREPLY=( $( compgen -W '-A --autobackup -d --debug -h --help -l \
-			-h --help -l --list -t --test -v --verbose \
+            --list -t --test -v --verbose --version' -- "$cur" ) )
-			--version' -- "$cur" ) )
     else
         _volumegroups
     fi
@@ -713,11 +711,9 @@ _lvs()
 
     case "$prev" in
         -@(o|O|-options|-sort))
-			COMPREPLY=( $( compgen -W 'lv_uuid lv_name \
+            COMPREPLY=( $( compgen -W 'lv_uuid lv_name lv_attr lv_minor \
-				lv_attr lv_minor lv_size seg_count \
+                lv_size seg_count origin snap_percent segtype stripes \
-				origin snap_percent segtype stripes \
+                stripesize chunksize seg_start seg_size' -- "$cur" ) )
-				stripesize chunksize seg_start \
-				seg_size' -- "$cur" ) )
             return 0
             ;;
         --units)
@@ -727,10 +723,9 @@ _lvs()
     esac
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '--aligned -d --debug \
+        COMPREPLY=( $( compgen -W '--aligned -d --debug -h --help \
-			-h --help --ignorelockingfailure --noheadings \
+            --ignorelockingfailure --noheadings --nosuffix -o --options -O \
-			--nosuffix -o --options -O --sort -P --partial \
+            --sort -P --partial --segments --separator --unbuffered --units \
-			--segments --separator --unbuffered --units \
             -v --verbose --version' -- "$cur" ) )
     else
         _logicalvolumes
@@ -1126,8 +1121,8 @@ complete -F _lvm lvm
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/lzma

@@ -40,8 +40,8 @@ complete -F _lzma $filenames lzma
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/lzop

@@ -26,19 +26,35 @@ _lzop()
     fi
 
     case "$prev" in
-		-o|--output)	_filedir ; return 0 ;;
+        -o|--output)
-		--path)		_filedir -d ; return 0 ;;
+            _filedir
-		-S|--suffix)	return 0 ;;
+            return 0
+            ;;
+        --path)
+            _filedir -d
+            return 0
+            ;;
+        -S|--suffix)
+            return 0
+            ;;
     esac
 
     xspec="*.?(t)lzo"
     case "$prev" in
         --@(@(de|un)compress|extract|list|ls|info|test))
-				xspec="!"$xspec ;;
+            xspec="!"$xspec
-		--force)	xspec= ;;
+            ;;
-		--*)		;;
+        --force)
-		-*f*|'<'|'>')	xspec= ;;
+            xspec=
-		-*[dltx]*)	xspec="!"$xspec ;;
+            ;;
+        --*)
+            ;;
+        -*f*|'<'|'>')
+            xspec=
+            ;;
+        -*[dltx]*)
+            xspec="!"$xspec
+            ;;
     esac
 
     _expand || return 0
@@ -51,8 +67,8 @@ complete -F _lzop $filenames lzop
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/mailman

@@ -14,9 +14,8 @@ _list_lists()
     cur=`_get_cword`
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '-a --advertised \
+        COMPREPLY=( $( compgen -W '-a --advertised --virtual-host-overview -V \
-			--virtual-host-overview -V -b --bare \
+            -b --bare -h --help' -- "$cur" ) )
-			-h --help' -- "$cur" ) )
     fi
 
 } &&
@@ -79,9 +78,8 @@ _remove_members()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '--file -f --all -a \
+        COMPREPLY=( $( compgen -W '--file -f --all -a --fromall --nouserack -n \
-			--fromall --nouserack -n --noadminack -N \
+            --noadminack -N --help -h' -- "$cur" ) )
-			--help -h' -- "$cur" ) )
     else
         _mailman_lists
     fi
@@ -110,8 +108,8 @@ _find_member()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '-l --listname -x \
+        COMPREPLY=( $( compgen -W '-l --listname -x --exclude --owners -w \
-			--exclude --owners -w --help -h' -- "$cur" ) )
+            --help -h' -- "$cur" ) )
     fi
 
 } &&
@@ -138,8 +136,8 @@ _clone_member()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '-l --listname --remove -r \
+        COMPREPLY=( $( compgen -W '-l --listname --remove -r --admin -a \
-		--admin -a --quiet -q --nomodify -n --help -h' -- "$cur" ) )
+            --quiet -q --nomodify -n --help -h' -- "$cur" ) )
     fi
 
 } &&
@@ -171,8 +169,8 @@ _sync_members()
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '--no-change -n --welcome-msg -w \
-			--goodbye-msg -g --digest -d --notifyadmin -a \
+            --goodbye-msg -g --digest -d --notifyadmin -a -f --file -h --help' \
-			-f --file -h --help' -- "$cur" ) )
+            -- "$cur" ) )
     else
         _mailman_lists
     fi
@@ -206,8 +204,8 @@ _list_admins()
     cur=`_get_cword`
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '--all-vhost -v \
+        COMPREPLY=( $( compgen -W '--all-vhost -v --all -a -h --help' \
-			--all -a -h --help' -- "$cur" ) )
+            -- "$cur" ) )
     else
         _mailman_lists
     fi
@@ -224,8 +222,8 @@ _list_owners()
     cur=`_get_cword`
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '-w --with-listnames \
+        COMPREPLY=( $( compgen -W '-w --with-listnames -m --moderators -h \
-			-m --moderators -h --help' -- "$cur" ) )
+            --help' -- "$cur" ) )
     else
         _mailman_lists
     fi
@@ -254,7 +252,8 @@ _list_members()
             return 0
             ;;
         -@(n|-nomail))
-			COMPREPLY=( $( compgen -W 'byadmin byuser bybounce unknown' -- "$cur") )
+            COMPREPLY=( $( compgen -W 'byadmin byuser bybounce unknown' \
+                -- "$cur") )
             return 0
             ;;
     esac
@@ -262,9 +261,8 @@ _list_members()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '--output -o --regular -r \
+        COMPREPLY=( $( compgen -W '--output -o --regular -r --digest -d \
-			--digest -d --nomail -n --fullnames -f \
+            --nomail -n --fullnames -f --preserve -p -h --help' -- "$cur" ) )
-			--preserve -p -h --help' -- "$cur" ) )
     else
         _mailman_lists
     fi
@@ -327,7 +325,8 @@ _newlist()
     cur=`_get_cword`
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '-l --language -q --quiet -h --help' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-l --language -q --quiet -h --help' \
+            -- "$cur" ) )
     else
         _mailman_lists
     fi
@@ -344,8 +343,7 @@ _rmlist()
     cur=`_get_cword`
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '--archives -a \
+        COMPREPLY=( $( compgen -W '--archives -a -h --help' -- "$cur" ) )
-			-h --help' -- "$cur" ) )
     else
         _mailman_lists
     fi
@@ -408,8 +406,8 @@ _arch()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '--wipe -s --start -e --end \
+        COMPREPLY=( $( compgen -W '--wipe -s --start -e --end -q --quiet -h \
-			-q --quiet -h --help' -- "$cur" ) )
+            --help' -- "$cur" ) )
     else
         args=$COMP_CWORD
         for (( i=1; i < COMP_CWORD; i++ )); do
@@ -439,8 +437,8 @@ _cleanarch()
     cur=`_get_cword`
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '-s --status -n --dry-run \
+        COMPREPLY=( $( compgen -W '-s --status -n --dry-run -q --quiet -h \
-			-q --quiet -h --help' -- "$cur" ) )
+            --help' -- "$cur" ) )
     fi
 
 } &&
@@ -467,8 +465,8 @@ _inject()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '-l --listname -q --queue \
+        COMPREPLY=( $( compgen -W '-l --listname -q --queue -h --help' \
-			-h --help' -- "$cur" ) )
+            -- "$cur" ) )
     else
         _filedir
     fi
@@ -485,7 +483,8 @@ _dumpdb()
     cur=`_get_cword`
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '--marshal -m --pickle -p --noprint -n -h --help' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--marshal -m --pickle -p --noprint -n -h \
+            --help' -- "$cur" ) )
     else
         _filedir
     fi
@@ -502,8 +501,8 @@ _check_db()
     cur=`_get_cword`
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '--all -a --verbose -v \
+        COMPREPLY=( $( compgen -W '--all -a --verbose -v -h --help' \
-			-h --help' -- "$cur" ) )
+            -- "$cur" ) )
     else
         _mailman_lists
     fi
@@ -595,8 +594,8 @@ complete -F _mailmanctl mailmanctl
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/make

@@ -72,8 +72,8 @@ complete -F _make $filenames make gmake gnumake pmake
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/man

@@ -76,8 +76,8 @@ complete -F _man $filenames man apropos whatis
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/mc

@@ -43,8 +43,8 @@ complete -F _mc $filenames mc
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/mcrypt

@@ -11,8 +11,7 @@ _mcrypt()
 
     case "$prev" in
         -@(g|-openpgp-z))
-			COMPREPLY=( $( compgen -W '0 1 2 3 4 5 6 7 8 9' \
+            COMPREPLY=( $( compgen -W '0 1 2 3 4 5 6 7 8 9' -- "$cur" ) )
-				-- "$cur" ) )
             return 0
             ;;
         -@(o|-keymode))
@@ -27,13 +26,13 @@ _mcrypt()
             return 0
             ;;
         -@(a|-algorithm))
-			COMPREPLY=( $( compgen -W "$( mcrypt --list \
+            COMPREPLY=( $( compgen -W "$( mcrypt --list 2>/dev/null | \
-				2>/dev/null | awk '{print $1}' )" -- "$cur" ) )
+                awk '{print $1}' )" -- "$cur" ) )
             return 0
             ;;
         -@(h|-hash))
-			COMPREPLY=( $( compgen -W '$( mcrypt --list-hash \
+            COMPREPLY=( $( compgen -W '$( mcrypt --list-hash 2>/dev/null | \
-				2>/dev/null | sed -e 1d )' -- "$cur" ) )
+                sed -e 1d )' -- "$cur" ) )
             return 0
             ;;
         -@(k|s|-@(key?(size))))
@@ -79,8 +78,8 @@ complete $filenames -F _mcrypt mcrypt mdecrypt
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/mdadm

@@ -20,10 +20,13 @@ _mdadm_raid_level()
 
     case $mode in
         create)
-			COMPREPLY=( $( compgen -W 'linear raid0 0 stripe raid1 1 mirror raid4 4 raid5 5 raid6 6 raid10 10 multipath mp faulty' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'linear raid0 0 stripe raid1 1 mirror \
+                raid4 4 raid5 5 raid6 6 raid10 10 multipath mp faulty' \
+                -- "$cur" ) )
             ;;
         build)
-			COMPREPLY=( $( compgen -W 'linear stripe raid0 0 raid1 multipath mp faulty' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'linear stripe raid0 0 raid1 multipath \
+                mp faulty' -- "$cur" ) )
             ;;
     esac
 }
@@ -40,13 +43,16 @@ _mdadm_raid_layout()
 
     case $level in
         raid5)
-			COMPREPLY=( $( compgen -W 'left-asymmetric left-symmetric right-asymmetric right-symmetric la ra ls rs' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'left-asymmetric left-symmetric \
+                right-asymmetric right-symmetric la ra ls rs' -- "$cur" ) )
             ;;
         raid10)
             COMPREPLY=( $( compgen -W 'n o p' -- "$cur" ) )
             ;;
         faulty)
-			COMPREPLY=( $( compgen -W 'write-transient wt read-transient rt write-persistent wp read-persistent rp write-all read-fixable rf clear flush none' -- $cur ) )
+            COMPREPLY=( $( compgen -W 'write-transient wt read-transient rt \
+                write-persistent wp read-persistent rp write-all read-fixable \
+                rf clear flush none' -- $cur ) )
             ;;
     esac
 }
@@ -58,7 +64,8 @@ _mdadm_auto_flag()
 
 _mdadm_update_flag()
 {
-	COMPREPLY=( $( compgen -W 'sparc2.2 summaries uuid name homehost resync byteorder super-minor' -- "$cur" ) )
+    COMPREPLY=( $( compgen -W 'sparc2.2 summaries uuid name homehost resync \
+        byteorder super-minor' -- "$cur" ) )
 }
 
 
@@ -122,28 +129,44 @@ _mdadm()
         esac
     fi
 
-        options='-h --help --help-options -V --version -v --verbose -q --quiet -b --brief -f --force -c --config= -s --scan -e --metadata= --homehost='
+    options='-h --help --help-options -V --version -v --verbose -q --quiet -b \
+        --brief -f --force -c --config= -s --scan -e --metadata= --homehost='
 
     if [[ "$cur" == -* ]]; then
         if [[ $COMP_CWORD -eq 1 ]] ; then
-			COMPREPLY=( $( compgen -W "$options -A --assemble -B --build -C --create -F --follow --monitor -G --grow" -- "$cur" ) )
+            COMPREPLY=( $( compgen -W "$options -A --assemble -B --build -C \
+                --create -F --follow --monitor -G --grow" -- "$cur" ) )
         else
             case ${COMP_WORDS[COMP_CWORD-1]} in
                 -@(A|-assemble))
-					COMPREPLY=( $( compgen -W "$options -u --uuid= -m --super-minor= -N --name= -f --force -R --run --no-degraded -a --auto -b --bitmap= --backup-file= -U --update= --auto-update-homehost" -- "$cur" ) )
+                    COMPREPLY=( $( compgen -W "$options -u --uuid= -m \
+                        --super-minor= -N --name= -f --force -R --run \
+                        --no-degraded -a --auto -b --bitmap= --backup-file= \
+                        -U --update= --auto-update-homehost" -- "$cur" ) )
                     ;;
                 -@(B|C|G|-build|-create|-grow))
-					COMPREPLY=( $( compgen -W "$options -n --raid-devices= -x --spare-devices= -z --size= -c --chunk= --rounding= -l --level= -p --layout= --parity= -b --bitmap= --bitmap-chunk= -W --write-mostly --write-behind= --assume-clean --backup-file= -N --name= -R --run -f --force -a --auto" -- "$cur" ) )
+                    COMPREPLY=( $( compgen -W "$options -n --raid-devices= -x \
+                        --spare-devices= -z --size= -c --chunk= --rounding= -l \
+                        --level= -p --layout= --parity= -b --bitmap= \
+                        --bitmap-chunk= -W --write-mostly --write-behind= \
+                        --assume-clean --backup-file= -N --name= -R --run -f \
+                        --force -a --auto" -- "$cur" ) )
                     ;;
                 -@(F|-follow|-monitor))
-					COMPREPLY=( $( compgen -W "$options -m --mail -p --program --alert -y --syslog -d --delay -f --daemonise -i --pid-file -1 --oneshot -t --test" -- "$cur" ) )
+                    COMPREPLY=( $( compgen -W "$options -m --mail -p --program \
+                        --alert -y --syslog -d --delay -f --daemonise -i \
+                        --pid-file -1 --oneshot -t --test" -- "$cur" ) )
 
                     ;;
                 @(/dev/*|--add|--fail|--remove))
-					COMPREPLY=( $( compgen -W "$options -a --add --re-add -r --remove -f --fail --set-faulty" -- "$cur" ) )
+                    COMPREPLY=( $( compgen -W "$options -a --add --re-add -r \
+                        --remove -f --fail --set-faulty" -- "$cur" ) )
                     ;;
                 *)
-					COMPREPLY=( $( compgen -W "$options -Q --query -D --detail -E --examine --sparc2.2 -X --examine-bitmap -R --run -S --stop -o --readonly -w --readwrite --zero-superblock -t --test" -- "$cur" ) )
+                    COMPREPLY=( $( compgen -W "$options -Q --query -D --detail \
+                        -E --examine --sparc2.2 -X --examine-bitmap -R --run \
+                        -S --stop -o --readonly -w --readwrite \
+                        --zero-superblock -t --test" -- "$cur" ) )
                     ;;
             esac
         fi
@@ -157,8 +180,8 @@ complete -F _mdadm mdadm
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/minicom

@@ -20,7 +20,8 @@ _minicom()
             ;;
         -P)
             COMPREPLY=( $( command ls /dev/tty* ) )
-			COMPREPLY=( $( compgen -W '${COMPREPLY[@]} ${COMPREPLY[@]#/dev/}' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '${COMPREPLY[@]} ${COMPREPLY[@]#/dev/}' \
+                -- "$cur" ) )
             return 0
             ;;
     esac
@@ -31,8 +32,10 @@ _minicom()
             -c -S -d -p -C -T -7 -8' -- "$cur" ) )
         return 0
     else
-		[ -n "$( command ls /etc/minirc.* 2>/dev/null)" ] && confdir=/etc
+        [ -n "$( command ls /etc/minirc.* 2>/dev/null)" ] \
-		[ -n "$( command ls /etc/minicom/minirc.* 2>/dev/null)" ] && confdir=/etc/minicom
+            && confdir=/etc
+        [ -n "$( command ls /etc/minicom/minirc.* 2>/dev/null)" ] \
+            && confdir=/etc/minicom
         if [ -n "$confdir" ]; then
             COMPREPLY=( $( compgen -W '$( command ls $confdir/minirc.* | \
                 sed -e "s|$confdir/minirc.||")' -- "$cur" ) )
@@ -44,8 +47,8 @@ complete -F _minicom $default minicom
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/mkinitrd

@@ -53,8 +53,8 @@ complete -F _mkinitrd mkinitrd
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/mock

@@ -29,8 +29,7 @@ _mock()
             return 0
             ;;
         -r|--root)
-			COMPREPLY=( $( compgen -W "$( command ls $cfgdir )" \
+            COMPREPLY=( $( compgen -W "$( command ls $cfgdir )" -- $cur ) )
-				-- $cur ) )
             COMPREPLY=( ${COMPREPLY[@]/%.cfg/} )
             return 0
             ;;
@@ -47,7 +46,9 @@ _mock()
             # (e.g. ix86 chroot builds in x86_64 mock host)
             # This would actually depend on what the target root
             # can be used to build for...
-			COMPREPLY=( $( compgen -W "$( command rpm --showrc | sed -ne 's/^\s*compatible\s\+archs\s*:\s*\(.*\)/\1/i p' )" -- "$cur" ) )
+            COMPREPLY=( $( compgen -W "$( command rpm --showrc | \
+                sed -ne 's/^\s*compatible\s\+archs\s*:\s*\(.*\)/\1/i p' )" \
+                -- "$cur" ) )
             return 0
             ;;
         --@(en|dis)able-plugin)
@@ -77,8 +78,8 @@ complete -F _mock $filenames mock
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/modules

@@ -57,12 +57,10 @@ _module () {
       COMPREPLY=( $(compgen -W "$options" -- "$cur") )
 
     elif [ $COMP_CWORD -eq 2 ] ; then
-
         case "$prev" in
             @(add|display|help|load|show|whatis))
                 COMPREPLY=( $(_module_avail "$cur") )
                 ;;
-
             @(rm|switch|swap|unload|update))
                 COMPREPLY=( $(_module_list "$cur") )
                 ;;
@@ -84,8 +82,8 @@ complete -F _module $default module
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/monodevelop

@@ -7,13 +7,8 @@ _monodevelop()
     cur=`_get_cword`
 
     if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '-? -help \
+        COMPREPLY=( $( compgen -W '-? -help -help2 -ipc-tcp -newwindow -nologo \
-									-help2 \
+            -usage -V -version' -- "$cur" ) )
-									-ipc-tcp \
-									-newwindow \
-									-nologo \
-									-usage \
-									-V -version' -- "$cur" ) )
     else
         _filedir
     fi
@@ -40,7 +35,8 @@ _mdtool()
     if [[ -n "$command" ]]; then
         case $command in
             "build")
-				COMPREPLY=( $( compgen -W '--f --buildfile --p --project' -S":" -- "$cur" ) )
+                COMPREPLY=( $( compgen -W '--f --buildfile --p --project' \
+                    -S":" -- "$cur" ) )
                 # TODO: This does not work :(
                 #if [[ "$prev" == *: ]]; then
                 #   case "$prev" in
@@ -57,37 +53,25 @@ _mdtool()
             "generate-makefiles")
                 COMPREPLY=( $( compgen $filenames -G"*.mds" -- "$cur" ) )
                 if [[ "$prev" == *mds ]]; then
-					COMPREPLY=( $( compgen -W '--simple-makefiles --s --d:' -- "$cur" ) )
+                    COMPREPLY=( $( compgen -W '--simple-makefiles --s --d:' \
+                        -- "$cur" ) )
                 fi
                 return 0
                 ;;
             "setup")
                 # TODO: at least return filenames after these options.
-				COMPREPLY=( $( compgen -W 'install i \
+                COMPREPLY=( $( compgen -W 'install i uninstall u check-install \
-											uninstall u \
+                    ci update up list l list-av la list-update lu rep-add ra \
-											check-install ci \
+                    rep-remove rr rep-update ru rep-list rl reg-update \
-											update up \
+                    reg-build rgu info rep-build rb pack p help h dump-file' \
-											list l \
+                    -- "$cur" ) )
-											list-av la \
-											list-update lu \
-											rep-add ra \
-											rep-remove rr \
-											rep-update ru \
-											rep-list rl \
-											reg-update reg-build rgu \
-											info \
-											rep-build rb \
-											pack p \
-											help h \
-											dump-file' -- "$cur" ) )
                 return 0
                 ;;
         esac
     fi
 
     COMPREPLY=( $( compgen -W 'gsetup build dbgen project-export \
-								generate-makefiles gettext-update \
+        generate-makefiles gettext-update setup -q' -- "$cur" ) )
-								setup -q' -- "$cur" ) )
 
     return 0
 } &&
@@ -95,8 +79,8 @@ complete -F _mdtool $filenames mdtool
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/mplayer

@@ -104,39 +104,29 @@ _mplayer()
             return 0
             ;;
         -lavdopts)
-			COMPREPLY=( $( compgen -W 'ec er= bug= idct= gray' \
+            COMPREPLY=( $( compgen -W 'ec er= bug= idct= gray' -- "$cur" ) )
-					-- "$cur" ) )
             return 0
             ;;
         -lavcopts)
-			COMPREPLY=( $( compgen -W 'vcodec= vqmin= vqscale= \
+            COMPREPLY=( $( compgen -W 'vcodec= vqmin= vqscale= vqmax= mbqmin= \
-					vqmax= mbqmin= mbqmax= vqdiff= \
+                mbqmax= vqdiff= vmax_b_frames= vme= vhq v4mv keyint= \
-					vmax_b_frames= vme= vhq v4mv \
+                vb_strategy= vpass= aspect= vbitrate= vratetol= vrc_maxrate= \
-					keyint= vb_strategy= vpass= \
+                vrc_minrate= vrc_buf_size= vb_qfactor= vi_qfactor= vb_qoffset= \
-					aspect= vbitrate= vratetol= \
+                vi_qoffset= vqblur= vqcomp= vrc_eq= vrc_override= \
-					vrc_maxrate= vrc_minrate= \
+                vrc_init_cplx= vqsquish= vlelim= vcelim= vstrict= vdpart \
-					vrc_buf_size= vb_qfactor= vi_qfactor= \
+                vpsize= gray vfdct= idct= lumi_mask= dark_mask= tcplx_mask= \
-					vb_qoffset= vi_qoffset= vqblur= \
+                scplx_mask= naq ildct format= pred qpel precmp= cmp= subcmp= \
-					vqcomp= vrc_eq= vrc_override= \
+                predia= dia= trell last_pred= preme= subq= psnr mpeg_quant aic \
-					vrc_init_cplx= vqsquish= vlelim= \
+                umv' -- "$cur" ) )
-					vcelim= vstrict= vdpart vpsize= gray \
-					vfdct= idct= lumi_mask= dark_mask= \
-					tcplx_mask= scplx_mask= naq ildct \
-					format= pred qpel precmp= cmp= \
-					subcmp= predia= dia= trell last_pred= \
-					preme= subq= psnr mpeg_quant aic umv' \
-					-- "$cur" ) )
         return 0
         ;;
     -ssf)
-			COMPREPLY=( $( compgen -W 'lgb= cgb= ls= cs= chs= \
+        COMPREPLY=( $( compgen -W 'lgb= cgb= ls= cs= chs= cvs=' -- "$cur" ) )
-					cvs=' -- "$cur" ) )
             return 0
             ;;
         -jpeg)
-			COMPREPLY=( $( compgen -W 'noprogressive progressive \
+            COMPREPLY=( $( compgen -W 'noprogressive progressive nobaseline \
-					nobaseline baseline optimize= \
+                baseline optimize= smooth= quality= outdir=' -- "$cur" ) )
-					smooth= quality= outdir=' -- "$cur" ) )
             return 0
             ;;
         -xvidopts)
@@ -144,99 +134,80 @@ _mplayer()
             return 0
             ;;
         -xvidencopts)
-			COMPREPLY=( $( compgen -W 'pass= bitrate= \
+            COMPREPLY=( $( compgen -W 'pass= bitrate= fixed_quant= me_quality= \
-					fixed_quant= me_quality= 4mv \
+                4mv rc_reaction_delay_factor= rc_averaging_period= rc_buffer= \
-					rc_reaction_delay_factor= \
+                quant_range= min_key_interval= max_key_interval= mpeg_quant \
-					rc_averaging_period= rc_buffer= \
+                mod_quant lumi_mask hintedme hintfile debug keyframe_boost= \
-					quant_range= min_key_interval= \
-					max_key_interval= mpeg_quant \
-					mod_quant lumi_mask hintedme \
-					hintfile debug keyframe_boost= \
                 kfthreshold= kfreduction=' -- "$cur" ) )
             return 0
             ;;
         -divx4opts)
-			COMPREPLY=( $( compgen -W 'br= key= deinterlace q= \
+            COMPREPLY=( $( compgen -W 'br= key= deinterlace q= min_quant= \
-					min_quant= max_quant= rc_period= \
+                max_quant= rc_period= rc_reaction_period= crispness= \
-					rc_reaction_period= crispness= \
+                rc_reaction_ratio= pass= vbrpass= help' -- "$cur" ) )
-					rc_reaction_ratio= pass= vbrpass= \
-					help' -- "$cur" ) )
             return 0
             ;;
         -info)
-			COMPREPLY=( $( compgen -W 'name= artist= genre= \
+            COMPREPLY=( $( compgen -W 'name= artist= genre= subject= \
-					subject= copyright= srcform= \
+                copyright= srcform= comment= help' -- "$cur" ) )
-					comment= help' -- "$cur" ) )
             return 0
             ;;
         -lameopts)
-			COMPREPLY=( $( compgen -W 'vbr= abr cbr br= q= aq= \
+            COMPREPLY=( $( compgen -W 'vbr= abr cbr br= q= aq= ratio= vol= \
-					ratio= vol= mode= padding= fast \
+                mode= padding= fast preset= help' -- "$cur" ) )
-					preset= help' -- "$cur" ) )
             return 0
             ;;
         -rawaudio)
-			COMPREPLY=( $( compgen -W 'on channels= rate= \
+            COMPREPLY=( $( compgen -W 'on channels= rate= samplesize= format=' \
-					samplesize= format=' -- "$cur" ) )
-			return 0
-			;;
-		-rawvideo)
-			COMPREPLY=( $( compgen -W 'on fps= sqcif qcif cif \
-					4cif pal ntsc w= h= y420 yv12 yuy2 \
-					y8 format= size=' -- "$cur" ) )
-			return 0
-			;;
-		-aop)
-			COMPREPLY=( $( compgen -W 'list= delay= format= fout= \
-					volume= mul= softclip' -- "$cur" ) )
-			return 0
-			;;
-		-dxr2)
-			COMPREPLY=( $( compgen -W 'ar-mode= iec958-encoded \
-					iec958-decoded mute ucode= 75ire bw \
-					color interlaced macrovision= norm= \
-					square-pixel ccir601-pixel cr-left= \
-					cr-right= cr-top= cr-bot= ck-rmin= \
-					ck-gmin= ck-bmin= ck-rmax= ck-gmax= \
-					ck-bmax= ck-r= ck-g= ck-b= \
-					ignore-cache= ol-osd= olh-cor= \
-					olw-cor= olx-cor= oly-cor= overlay \
-					overlay-ratio= update-cache' -- "$cur" ))
-			return 0
-			;;
-		-tv)
-			COMPREPLY=( $( compgen -W 'on noaudio driver= device= \
-					input= freq= outfmt= width= height= \
-					buffersize= norm= channel= chanlist= \
-					audiorate= forceaudio alsa amode= \
-					forcechan= adevice= audioid= volume= \
-					bass= treble= balance= fps= \
-					channels= immediatemode=' -- "$cur" ) )
-			return 0
-			;;
-		-mf)
-			COMPREPLY=( $( compgen -W 'on w= h= fps= type=' \
                 -- "$cur" ) )
             return 0
             ;;
+        -rawvideo)
+            COMPREPLY=( $( compgen -W 'on fps= sqcif qcif cif 4cif pal ntsc w= \
+                h= y420 yv12 yuy2 y8 format= size=' -- "$cur" ) )
+            return 0
+            ;;
+        -aop)
+            COMPREPLY=( $( compgen -W 'list= delay= format= fout= volume= mul= \
+                softclip' -- "$cur" ) )
+            return 0
+            ;;
+        -dxr2)
+            COMPREPLY=( $( compgen -W 'ar-mode= iec958-encoded iec958-decoded \
+                mute ucode= 75ire bw color interlaced macrovision= norm= \
+                square-pixel ccir601-pixel cr-left= cr-right= cr-top= cr-bot= \
+                ck-rmin= ck-gmin= ck-bmin= ck-rmax= ck-gmax= ck-bmax= ck-r= \
+                ck-g= ck-b= ignore-cache= ol-osd= olh-cor= olw-cor= olx-cor= \
+                oly-cor= overlay overlay-ratio= update-cache' -- "$cur" ))
+            return 0
+            ;;
+        -tv)
+            COMPREPLY=( $( compgen -W 'on noaudio driver= device= input= freq= \
+                outfmt= width= height= buffersize= norm= channel= chanlist= \
+                audiorate= forceaudio alsa amode= forcechan= adevice= audioid= \
+                volume= bass= treble= balance= fps= channels= immediatemode=' \
+                -- "$cur" ) )
+            return 0
+            ;;
+        -mf)
+            COMPREPLY=( $( compgen -W 'on w= h= fps= type=' -- "$cur" ) )
+            return 0
+            ;;
         -cdda)
-			COMPREPLY=( $( compgen -W 'speed= paranoia= \
+            COMPREPLY=( $( compgen -W 'speed= paranoia= generic-dev= \
-					generic-dev= sector-size= overlap= \
+                sector-size= overlap= toc-bias toc-offset= skip noskip' \ 
-					toc-bias toc-offset= skip noskip' \
                 -- "$cur" ) )
             return 0
             ;;
         -input)
-			COMPREPLY=( $( compgen -W 'conf= ar-delay ar-rate \
+            COMPREPLY=( $( compgen -W 'conf= ar-delay ar-rate keylist cmdlist \
-					keylist cmdlist js-dev file' -- "$cur" ) )
+                js-dev file' -- "$cur" ) )
             return 0
             ;;
         -af)
-			COMPREPLY=( $( compgen -W 'resample resample= \
+            COMPREPLY=( $( compgen -W 'resample resample= channels channels= \
-					channels channels= format format= \
+                format format= volume volume= delay delay= pan pan= sub sub= \
-					volume volume= delay delay= pan \
+                surround surround=' -- "$cur" ) )
-					pan= sub sub= surround surround=' \
-					-- "$cur" ) )
             return 0
             ;;
         -af-adv)
@@ -264,8 +235,8 @@ complete $filenames -F _mplayer mplayer mencoder gmplayer kplayer
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/msynctool

@@ -48,8 +48,8 @@ complete -F _msynctool msynctool
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/mtx

@@ -45,8 +45,8 @@ complete -F _mtx mtx
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/munin-node

@@ -53,8 +53,7 @@ _munin-update()
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '--force-root --[no]force-root \
             --service --host --config --help --debug --nodebug \
-			--fork --nofork --stdout --nostdout --timeout' \
+            --fork --nofork --stdout --nostdout --timeout' -- "$cur" ) )
-			-- "$cur" ) )
     fi
 } &&
 complete -F _munin-update munin-update
@@ -90,16 +89,15 @@ _munin-node-configure()
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '--help --version --debug --config \
             --servicedir --libdir --families --suggest --shell \
-			--remove-also --snmp --snmpversion --snmpcommunity' \
+            --remove-also --snmp --snmpversion --snmpcommunity' -- "$cur" ) )
-			-- "$cur" ) )
     fi
 } &&
 complete -F _munin-node-configure munin-node-configure
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/mutt

@@ -63,8 +63,7 @@ _muttquery()
     if [ -z "$cur" -o -z "$querycmd" ]; then
         queryresults=()
     else
-	    queryresults=( $( $querycmd | \
+        queryresults=( $( $querycmd | sed -nr '2,$s|^([^[:space:]]+).*|\1|p' ) )
-	      sed -nr '2,$s|^([^[:space:]]+).*|\1|p' ) )
     fi
 
     COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "${queryresults[*]}" \
@@ -90,7 +89,8 @@ _muttfiledir()
         COMPREPLY=( ${COMPREPLY[@]#$folder/} )
         return 0
     elif [ "$cur" == !* ]; then
-		spoolfile="$( $muttcmd -Q spoolfile | sed -r 's|^spoolfile=\"(.*)\"$|\1|' )"
+        spoolfile="$( $muttcmd -Q spoolfile | \
+            sed -r 's|^spoolfile=\"(.*)\"$|\1|' )"
         [ ! -z "$spoolfile" ] && eval cur="${cur/^!/$spoolfile}";
     fi
     _filedir
@@ -109,8 +109,7 @@ _mutt()
     case "$cur" in
     -*)
         COMPREPLY=( $( compgen -W '-A -a -b -c -e -f -F -H -i -m -n \
-					    -p -Q -R -s -v -x -y -z -Z -h' \
+            -p -Q -R -s -v -x -y -z -Z -h' -- "$cur" ) )
-					    -- "$cur" ) )
         return 0
         ;;
     *)
@@ -140,8 +139,8 @@ complete -F _mutt $default $filenames mutt muttng
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/mysqladmin

@@ -22,19 +22,17 @@ _mysqladmin()
         -v -V -w' -- "$cur" ) )
 
     COMPREPLY=( "${COMPREPLY[@]}" \
-		    $( compgen -W 'create drop extended-status flush-hosts \
+        $( compgen -W 'create drop extended-status flush-hosts flush-logs \
-				   flush-logs flush-status flush-tables \
+        flush-status flush-tables flush-threads flush-privileges kill \
-				   flush-threads flush-privileges kill \
+        password ping processlist reload refresh shutdown status variables \
-				   password ping processlist reload refresh \
+        version' -- "$cur" ) )
-				   shutdown status variables version' \
-		       -- "$cur" ) )
 } &&
 complete -F _mysqladmin mysqladmin
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/ncftp

@@ -19,8 +19,8 @@ complete -F _ncftp $default ncftp
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/net-tools

@@ -108,8 +108,8 @@ _route()
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/ntpdate

@@ -31,8 +31,8 @@ complete -F _ntpdate ntpdate
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/openldap

@@ -37,8 +37,7 @@ _ldapsearch()
             return 0
             ;;
         -s)
-			COMPREPLY=( $( compgen -W 'base one sub children' \
+            COMPREPLY=( $( compgen -W 'base one sub children' -- "$cur" ) )
-				-- "$cur" ) )
             return 0
             ;;
         -a)
@@ -127,8 +126,7 @@ _ldapdelete()
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '-n -v -c -M -MM -d -f -D -W -w -y \
-			-H -h -P -p -O -U -R -r -x -I -Q -X -Y -Z -ZZ' \
+            -H -h -P -p -O -U -R -r -x -I -Q -X -Y -Z -ZZ' -- "$cur" ) )
-			-- "$cur" ) )
     fi
 }
 complete -F _ldapdelete ldapdelete
@@ -162,8 +160,7 @@ _ldapcompare()
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '-n -v -z -M -MM -d -D -W -w -y \
-			-H -h -P -p -O -I -Q -U -R -x -X -Y -Z -ZZ' \
+            -H -h -P -p -O -I -Q -U -R -x -X -Y -Z -ZZ' -- "$cur" ) )
-			-- "$cur" ) )
     fi
 }
 complete -F _ldapcompare ldapcompare
@@ -197,8 +194,7 @@ _ldapmodrdn()
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '-r -s -n -v -c -M -MM -d -D -W -w \
-			-y -H -h -P -p -O -I -Q -U -R -x -X -Y -Z -ZZ -f' \
+            -y -H -h -P -p -O -I -Q -U -R -x -X -Y -Z -ZZ -f' -- "$cur" ) )
-			-- "$cur" ) )
     fi
 }
 complete -F _ldapmodrdn ldapmodrdn
@@ -270,8 +266,8 @@ complete -F _ldappasswd ldappasswd
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/openssl

@@ -100,176 +100,127 @@ _openssl()
             # possible options for the command
             case $command in
                 asn1parse)
-					options='-inform -in -out -noout \
+                    options='-inform -in -out -noout -offset -length -i -oid \
-						-offset -length -i -oid \
                         -strparse'
                     ;;
                 ca)
-					options='-verbose -config -name \
+                    options='-verbose -config -name -gencrl -revoke \
-						-gencrl -revoke -crl_reason \
+                        -crl_reason -crl_hold -crl_compromise \
-						-crl_hold -crl_compromise \
+                        -crl_CA_compromise -crldays -crlhours -crlexts \
-						-crl_CA_compromise -crldays \
+                        -startdate -enddate -days -md -policy -keyfile -key \
-						-crlhours -crlexts -startdate \
+                        -passin -cert -selfsig -in -out -notext -outdir \
-						-enddate -days -md -policy \
+                        -infiles -spkac -ss_cert -preserveDN -noemailDN \
-						-keyfile -key -passin -cert \
+                        -batch -msie_hack -extensions -extfile -engine \
-						-selfsig -in -out -notext \
-						-outdir -infiles -spkac \
-						-ss_cert -preserveDN \
-						-noemailDN -batch -msie_hack \
-						-extensions -extfile -engine \
                         -subj -utf8 -multivalue-rdn'
                         ;;
                 ciphers)
                     options='-v -ssl2 -ssl3 -tls1'
                     ;;
                 crl)
-					options='-inform -outform -text -in \
+                    options='-inform -outform -text -in -out -noout -hash \
-						-out -noout -hash -issuer \
+                        -issuer -lastupdate -nextupdate -CAfile -CApath'
-						-lastupdate -nextupdate \
-						-CAfile -CApath'
                     ;;
                 crl2pkcs7)
-					options='-inform -outform -in -out \
+                    options='-inform -outform -in -out -print_certs'
-						-print_certs'
                     ;;
                 dgst)
-					options='-md5 -md4 -md2 -sha1 -sha \
+                    options='-md5 -md4 -md2 -sha1 -sha -mdc2 -ripemd160 -dss1 \
-						-mdc2 -ripemd160 -dss1 -c -d \
+                        -c -d -hex -binary -out -sign -verify -prverify \
-						-hex -binary -out -sign \
+                        -signature'
-						-verify -prverify -signature'
                     ;;
                 dsa)
-					options='-inform -outform -in -passin \
+                    options='-inform -outform -in -passin -out -passout -des \
-						-out -passout -des -des3 -idea \
+                        -des3 -idea -text -noout -modulus -pubin -pubout'
-						-text -noout -modulus -pubin \
-						-pubout'
                     ;;
                 dsaparam)
-					options='-inform -outform -in -out \
+                    options='-inform -outform -in -out -noout -text -C -rand \
-						-noout -text -C -rand -genkey'
+                        -genkey'
                     ;;
                 enc)
-					options='-ciphername -in -out -pass \
+                    options='-ciphername -in -out -pass -e -d -a -A -k -kfile \
-						-e -d -a -A -k -kfile -S -K \
+                        -S -K -iv -p -P -bufsize -debug'
-						-iv -p -P -bufsize -debug'
                     ;;
                 dhparam)
-					options='-inform -outform -in -out \
+                    options='-inform -outform -in -out -dsaparam -noout -text \
-						-dsaparam -noout -text -C -2 \
+                        -C -2 -5 -rand'
-						-5 -rand'
                     ;;
                 gendsa)
                     options='-out -des -des3 -idea -rand'
                     ;;
                 genrsa)
-					options='-out -passout -des -des3 \
+                    options='-out -passout -des -des3 -idea -f4 -3 -rand'
-						-idea -f4 -3 -rand'
                     ;;
                 pkcs7)
-					options='-inform -outform -in -out \
+                    options='-inform -outform -in -out -print_certs -text \
-						-print_certs -text -noout'
+                        -noout'
                     ;;
                 rand)
                     options='-out -rand -base64'
                     ;;
                 req)
-					options='-inform -outform -in -passin \
+                    options='-inform -outform -in -passin -out -passout -text \
-						-out -passout -text -noout \
+                        -noout -verify -modulus -new -rand -newkey -newkey \
-						-verify -modulus -new -rand \
+                        -nodes -key -keyform -keyout -md5 -sha1 -md2 -mdc2 \
-						-newkey -newkey -nodes -key \
+                        -config -x509 -days -asn1-kludge -newhdr -extensions \
-						-keyform -keyout -md5 -sha1 \
+                        -reqexts section'
-						-md2 -mdc2 -config -x509 \
-						-days -asn1-kludge -newhdr \
-						-extensions -reqexts section'
                     ;;
                 rsa)
-					options='-inform -outform -in -passin \
+                    options='-inform -outform -in -passin -out -passout \
-						-out -passout -sgckey -des \
+                        -sgckey -des -des3 -idea -text -noout -modulus -check \
-						-des3 -idea -text -noout \
+                        -pubin -pubout -engine'
-						-modulus -check -pubin -pubout \
-						-engine'
                     ;;
                 rsautl)
-					options='-in -out -inkey -pubin \
+                    options='-in -out -inkey -pubin -certin -sign -verify \
-						-certin -sign -verify -encrypt \
+                        -encrypt -decrypt -pkcs -ssl -raw -hexdump -asn1parse'
-						-decrypt -pkcs -ssl -raw \
-						-hexdump -asn1parse'
                     ;;
                 s_client)
-					options='-connect -verify -cert \
+                    options='-connect -verify -cert -certform -key -keyform \
-						-certform -key -keyform -pass \
+                        -pass -CApath -CAfile -reconnect -pause -showcerts \
-						-CApath -CAfile -reconnect \
+                        -debug -msg -nbio_test -state -nbio -crlf -ign_eof \
-						-pause -showcerts -debug -msg \
+                        -quiet -ssl2 -ssl3 -tls1 -no_ssl2 -no_ssl3 -no_tls1 \
-						-nbio_test -state -nbio -crlf \
+                        -bugs -cipher -starttls -engine -tlsextdebug \
-						-ign_eof -quiet -ssl2 -ssl3 \
+                        -no_ticket -sess_out -sess_in -rand'
-						-tls1 -no_ssl2 -no_ssl3 \
-						-no_tls1 -bugs -cipher \
-						-starttls -engine -tlsextdebug \
-						-no_ticket -sess_out -sess_in \
-						-rand'
                     ;;
                 s_server)
-					options='-accept -context -verify \
+                    options='-accept -context -verify -Verify -crl_check \
-						-Verify -crl_check \
+                        -crl_check_all -cert -certform -key -keyform -pass \
-						-crl_check_all -cert -certform \
+                        -dcert -dcertform -dkey -dkeyform -dpass -dhparam \
-						-key -keyform -pass -dcert \
+                        -nbio -nbio_test -crlf -debug -msg -state -CApath \
-						-dcertform -dkey -dkeyform \
+                        -CAfile -nocert -cipher -quiet -no_tmp_rsa -ssl2 \
-						-dpass -dhparam -nbio \
+                        -ssl3 -tls1 -no_ssl2 -no_ssl3 -no_tls1 -no_dhe \
-						-nbio_test -crlf -debug -msg \
+                        -bugs -hack -www -WWW -HTTP -engine -tlsextdebug \
-						-state -CApath -CAfile -nocert \
-						-cipher -quiet -no_tmp_rsa \
-						-ssl2 -ssl3 -tls1 -no_ssl2 \
-						-no_ssl3 -no_tls1 -no_dhe \
-						-bugs -hack -www -WWW -HTTP \
-						-engine -tlsextdebug \
                         -no_ticket -id_prefix -rand'
                     ;;
                 s_time)
-					options='-connect -www -cert -key \
+                    options='-connect -www -cert -key -CApath -CAfile -reuse \
-						-CApath -CAfile -reuse -new \
+                        -new -verify -nbio -time -ssl2 -ssl3 -bugs -cipher'
-						-verify -nbio -time -ssl2 \
-						-ssl3 -bugs -cipher'
                     ;;
                 sess_id)
-					options='-inform -outform -in -out \
+                    options='-inform -outform -in -out -text -noout -context \
-						-text -noout -context ID'
+                        ID'
                     ;;
                 smime)
-					options='-encrypt -decrypt -sign \
+                    options='-encrypt -decrypt -sign -verify -pk7out -des \
-						-verify -pk7out -des -des3 \
+                        -des3 -rc2-40 -rc2-64 -rc2-128 -aes128 -aes192 -aes256 \
-						-rc2-40 -rc2-64 -rc2-128 \
+                        -in -certfile -signer -recip -inform -passin -inkey \
-						-aes128 -aes192 -aes256 -in \
+                        -out -outform -content -to -from -subject -text -rand'
-						-certfile -signer -recip \
-						-inform -passin -inkey -out \
-						-outform -content -to -from \
-						-subject -text -rand'
                     ;;
                 speed)
                     options='-engine'
                     ;;
                 verify)
-					options='-CApath -CAfile -purpose \
+                    options='-CApath -CAfile -purpose -untrusted -help \
-						-untrusted -help \
+                        -issuer_checks -verbose -certificates'
-						-issuer_checks -verbose \
-						-certificates'
                     ;;
                 x509)
-					options='-inform -outform -keyform \
+                    options='-inform -outform -keyform -CAform -CAkeyform -in \
-						-CAform -CAkeyform -in -out \
+                        -out -serial -hash -subject-hash -issuer_hash -subject \
-						-serial -hash -subject-hash \
+                        -issuer -nameopt -email -startdate -enddate -purpose \
-						-issuer_hash -subject -issuer \
+                        -dates -modulus -fingerprint -alias -noout -trustout \
-						-nameopt -email -startdate \
+                        -clrtrust -clrreject -addtrust -addreject -setalias \
-						-enddate -purpose -dates \
+                        -days -set_serial -signkey -x509toreq -req -CA -CAkey \
-						-modulus -fingerprint -alias \
+                        -CAcreateserial -CAserial -text -C -md2 -md5 -sha1 \
-						-noout -trustout -clrtrust \
+                        -mdc2 -clrext -extfile -extensions -engine'
-						-clrreject -addtrust \
-						-addreject -setalias -days \
-						-set_serial -signkey \
-						-x509toreq -req -CA -CAkey \
-						-CAcreateserial -CAserial \
-						-text -C -md2 -md5 -sha1 -mdc2 \
-						-clrext -extfile -extensions \
-						-engine'
                     ;;
                 @(md5|md4|md2|sha1|sha|mdc2|ripemd160))
                     options='-c -d'
@@ -278,12 +229,10 @@ _openssl()
             COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
         else
             if [[ "$command" == speed ]]; then
-				COMPREPLY=( $( compgen -W 'md2 mdc2 md5 hmac \
+                COMPREPLY=( $( compgen -W 'md2 mdc2 md5 hmac sha1 rmd160 \
-					sha1 rmd160 idea-cbc rc2-cbc rc5-cbc \
+                    idea-cbc rc2-cbc rc5-cbc bf-cbc des-cbc des-ede3 rc4 \
-					bf-cbc des-cbc des-ede3 rc4 rsa512 \
+                    rsa512 rsa1024 rsa2048 rsa4096 dsa512 dsa1024 dsa2048 idea \
-					rsa1024 rsa2048 rsa4096 dsa512 dsa1024 \
+                    rc2 des rsa blowfish' -- "$cur" ) )
-					dsa2048 idea rc2 des rsa blowfish' -- \
-					"$cur" ) )
             else
                 _filedir
             fi
@@ -295,8 +244,8 @@ complete -F _openssl $default openssl
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/p4

@@ -36,8 +36,7 @@ _p4()
             -t)
                 case "$prev2" in
                     add|edit|reopen)
-				COMPREPLY=( $( compgen -W "$p4filetypes" \
+                        COMPREPLY=( $( compgen -W "$p4filetypes" -- "$cur") )
-					       -- "$cur") )
                         ;;
                     *)
                         ;;
@@ -54,8 +53,8 @@ complete -F _p4 $default p4 g4
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/perl

@@ -108,7 +108,10 @@ _perldoc()
         # return available modules (unless it is clearly a file)
         if [[ "$cur" != */* ]]; then
             _perlmodules
-		    COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W '$( PAGER=/bin/cat man perl |  sed -ne "/perl.*Perl overview/,/perlwin32/p" | awk "\$NF=2 { print \$1}" | grep perl )' -- "$cur" ) )
+            COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W \
+                '$( PAGER=/bin/cat man perl |  \
+                sed -ne "/perl.*Perl overview/,/perlwin32/p" | \
+                awk "\$NF=2 { print \$1}" | grep perl )' -- "$cur" ) )
         fi
     fi
 }
@@ -117,8 +120,8 @@ complete -F _perldoc $default perldoc
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/pine

@@ -8,15 +8,15 @@ _pineaddr()
     COMPREPLY=()
     cur=`_get_cword`
 
-	COMPREPLY=( $( compgen -W '$( awk "{print \$1}" ~/.addressbook 2>/dev/null)' \
+    COMPREPLY=( $( compgen -W '$( awk "{print \$1}" ~/.addressbook \
-			-- "$cur" ) )
+        2>/dev/null)' -- "$cur" ) )
 } &&
 complete -F _pineaddr $default pine
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/pkg-config

@@ -45,8 +45,8 @@ complete -F _pkg_config pkg-config
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/pkg_install

@@ -24,8 +24,8 @@ complete -F _pkg_delete $dirnames pkg_delete pkg_info
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/pkgtools

@@ -15,8 +15,8 @@ complete -F _removepkg $filenames removepkg &&
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/portupgrade

@@ -52,8 +52,8 @@ complete -F _pkg_delete $dirnames pkg_deinstall
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh

contrib/postfix

@@ -229,8 +229,8 @@ complete -F _postsuper $filenames postsuper
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 8
+# sh-basic-offset: 4
 # sh-indent-comment: t
-# indent-tabs-mode: t
+# indent-tabs-mode: nil
 # End:
-# ex: ts=8 sw=8 noet filetype=sh
+# ex: ts=4 sw=4 et filetype=sh