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

Ville Skyttä ville.skytta at iki.fi
Mon Jan 18 17:29:37 UTC 2010


The following commit has been merged in the master branch:
commit 08e746ea109366cd1ba6b52cb02e95c094726876
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Jan 18 19:21:08 2010 +0200

    Add pbzip2, pbunzip2, and pbzcat completions.

diff --git a/CHANGES b/CHANGES
index 68711bb..3208b5b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -30,7 +30,7 @@ bash-completion (2.x)
     vncviewer, yp-tools, and general hostname completions.
   * Add abook and wtf completion, based on work by Raphaël Droz.
   * Add cvsps, dragon, fusermount, jarsigner, k3b, lftpget, pm-utils, rtcwake,
-    pack200, unpack200, pigz and unpigz completions.
+    pack200, unpack200, pbzip2, pbunzip2, pbzcat, pigz and unpigz completions.
   * Don't overwrite other host completions when completing from multiple
     SSH known hosts files.
   * Speed up installed rpm package completion on SUSE, based on work by
diff --git a/bash_completion b/bash_completion
index 028da88..c914498 100644
--- a/bash_completion
+++ b/bash_completion
@@ -69,7 +69,7 @@ complete -d pushd
 #
 # START exclude -- do NOT remove this line
 # bzcmp, bzdiff, bz*grep, bzless, bzmore intentionally not here, see Debian: #455510
-complete -f -X '!*.?(t)bz?(2)' bunzip2 bzcat
+complete -f -X '!*.?(t)bz?(2)' bunzip2 bzcat pbunzip2 pbzcat
 complete -f -X '!*.@(zip|ZIP|jar|JAR|exe|EXE|pk3|war|wsz|ear|zargo|xpi|sxw|ott|od[fgpst]|epub)' unzip zipinfo
 complete -f -X '*.Z' compress znew
 # zcmp, zdiff, z*grep, zless, zmore intentionally not here, see Debian: #455510
diff --git a/contrib/bzip2 b/contrib/bzip2
index 68fb7c5..9001dd5 100644
--- a/contrib/bzip2
+++ b/contrib/bzip2
@@ -1,6 +1,6 @@
 # bash completion for bzip2
 
-have bzip2 &&
+have bzip2 || have pbzip2 &&
 _bzip2()
 {
     local cur prev xspec helpopts
@@ -8,10 +8,16 @@ _bzip2()
     COMPREPLY=()
     cur=`_get_cword`
     prev=${COMP_WORDS[COMP_CWORD-1]}
-    helpopts=`_parse_help bzip2`
+    helpopts=`_parse_help ${COMP_WORDS[0]}`
+
+    case $prev in
+        -b|-h|--help|-p)
+            return 0
+            ;;
+    esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W "$helpopts -2 -3 -4 -5 -6 -7 -8 -9" \
+        COMPREPLY=( $( compgen -W "${helpopts//#/} -2 -3 -4 -5 -6 -7 -8 -9" \
             -- "$cur" ) )
         return 0
     fi
@@ -34,7 +40,7 @@ _bzip2()
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
         $( compgen -d -- "$cur" ) )
 } &&
-complete -F _bzip2 -o filenames bzip2
+complete -F _bzip2 -o filenames bzip2 pbzip2
 
 # Local variables:
 # mode: shell-script

-- 
bash-completion



More information about the Bash-completion-commits mailing list