[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3

[David Paleino]

The following commit has been merged in the master branch:
commit a0bb238dc80e47a1f75ac97bc6fc3000eaffee05
Merge: 99522d8ce4a697b649d93796939a78fc98dd5297 cb01d8ea5434c2c9f4826b35f5f687d7723102e8
Author: David Paleino <dapal at debian.org>
Date:   Sun Feb 6 17:50:38 2011 +0100

    Merge branch 'master' into 1.x

diff --combined CHANGES
index 5e2e02c,d54844c..8692b20
--- a/CHANGES
+++ b/CHANGES
@@@ -1,4 -1,4 +1,4 @@@
 -bash-completion (2.x)
 +bash-completion (1.3)
  
    [ Guillaume Rousse ]
    * added pure-perl perldoc completion helper, using work from Aristotle 
@@@ -14,9 -14,9 +14,9 @@@
    [ Ville Skyttä ]
    * Activate hping2 completion also for hping and hping3.
    * Add badblocks, compgen, crontab, dumpe2fs, e2freefrag, e2label, ether-wake,
-     filefrag, growisofs, iftop, ip (Debian: #600617), lrzip, lsof, mktemp,
-     portecle, POSIX sh, sha{,224,256,384,512}sum, sysbench, tune2fs, xmodmap,
-     and xrdb completions.
+     filefrag, gendiff, growisofs, iftop, ip (Debian: #600617), javaws, kid3,
+     lrzip, lsof, mktemp, portecle, POSIX sh, sha{,224,256,384,512}sum,
+     sysbench, tune2fs, xmodmap, and xrdb completions.
    * Add *.gif (Alioth: #312512), *.m2t (Alioth: #312770), *.3gpp, *.3gpp2,
      *.awb, and *.iso (Alioth: #311420) to mplayer filename completions.
    * Add "short" tarball extensions to unxz, unlzma etc completions.
diff --combined bash_completion
index a9b8120,98fe339..97d25ab
--- a/bash_completion
+++ b/bash_completion
@@@ -23,7 -23,7 +23,7 @@@
  #
  #   http://bash-completion.alioth.debian.org/
  #
 -#   RELEASE: 2.x
 +#   RELEASE: 1.1
  
  if [[ $- == *v* ]]; then
      BASH_COMPLETION_ORIGINAL_V_VALUE="-v"
@@@ -123,6 -123,7 +123,7 @@@ complete -f -X '!*.ly' lilypond ly2dv
  complete -f -X '!*.@(dif?(f)|?(d)patch)?(.@([gx]z|bz2|lzma))' cdiff
  complete -f -X '!*.lyx' lyx
  complete -f -X '!@(*.@(ks|jks|jceks|p12|pfx|bks|ubr|gkr|cer|crt|cert|p7b|pkipath|pem|p10|csr|crl)|cacerts)' portecle
+ complete -f -X '!*.@(mp[234c]|og[ag]|@(fl|a)ac|m4[abp]|spx|tta|w?(a)v|wma|aif?(f)|asf|ape)' kid3 kid3-qt
  # FINISH exclude -- do not remove this line
  
  # start of section containing compspecs that can be handled within bash
@@@ -687,7 -688,7 +688,7 @@@ _split_longopt(
  #
  _parse_help() {
      $1 ${2:---help} 2>&1 | sed -e '/^[[:space:]]*-/!d' -e 's|[,/]| |g' | \
-         awk '{ print $1; if ($2 ~ /^-/) { print $2 } }' | sed -e 's|=.*||'
+         awk '{ print $1; if ($2 ~ /^-/) { print $2 } }' | sed -e 's|[<=].*||'
  }
  
  # This function completes on signal names
@@@ -1244,12 -1245,10 +1245,10 @@@ _known_hosts_real(
          [ -r "$configfile" ] &&
          config=( "${config[@]}" "$configfile" )
      else
-         [ -r /etc/ssh/ssh_config ] &&
-         config=( "${config[@]}" "/etc/ssh/ssh_config" )
-         [ -r "${HOME}/.ssh/config" ] &&
-         config=( "${config[@]}" "${HOME}/.ssh/config" )
-         [ -r "${HOME}/.ssh2/config" ] &&
-         config=( "${config[@]}" "${HOME}/.ssh2/config" )
+         for i in /etc/ssh/ssh_config "${HOME}/.ssh/config" \
+             "${HOME}/.ssh2/config"; do
+             [ -r $i ] && config=( "${config[@]}" "$i" )
+         done
      fi
  
      # Known hosts files from configs
@@@ -1271,28 -1270,16 +1270,16 @@@
          IFS=$OIFS
      fi
  
-     # Global known_hosts files
-     if [ -z "$configfile" ]; then
-         [ -r /etc/ssh/ssh_known_hosts ] &&
-         kh=( "${kh[@]}" /etc/ssh/ssh_known_hosts )
-         [ -r /etc/ssh/ssh_known_hosts2 ] &&
-         kh=( "${kh[@]}" /etc/ssh/ssh_known_hosts2 )
-         [ -r /etc/known_hosts ] &&
-         kh=( "${kh[@]}" /etc/known_hosts )
-         [ -r /etc/known_hosts2 ] &&
-         kh=( "${kh[@]}" /etc/known_hosts2 )
-         [ -d /etc/ssh2/knownhosts ] &&
-         khd=( "${khd[@]}" /etc/ssh2/knownhosts/*pub )
-     fi
- 
-     # User known_hosts files
      if [ -z "$configfile" ]; then
-         [ -r ~/.ssh/known_hosts ] &&
-         kh=( "${kh[@]}" ~/.ssh/known_hosts )
-         [ -r ~/.ssh/known_hosts2 ] &&
-         kh=( "${kh[@]}" ~/.ssh/known_hosts2 )
-         [ -d ~/.ssh2/hostkeys ] &&
-         khd=( "${khd[@]}" ~/.ssh2/hostkeys/*pub )
+         # Global and user known_hosts files
+         for i in /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 \
+             /etc/known_hosts /etc/known_hosts2 ~/.ssh/known_hosts \
+             ~/.ssh/known_hosts2; do
+             [ -r $i ] && kh=( "${kh[@]}" $i )
+         done
+         for i in /etc/ssh2/knownhosts ~/.ssh2/hostkeys; do
+             [ -d $i ] && khd=( "${khd[@]}" $i/*pub )
+         done
      fi
  
      # If we have known_hosts files to use

-- 
bash-completion