diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2010-01-18 19:21:08 +0200 |
|---|---|---|
| committer | Ville Skyttä <ville.skytta@iki.fi> | 2010-01-18 19:21:08 +0200 |
| commit | 08e746ea109366cd1ba6b52cb02e95c094726876 (patch) | |
| tree | 190b5dc0e176acae9eb13dee2f2afd8b7b62789d | |
| parent | 5d9e4f0c693fe1b3eaa5361a99b5409d166bec72 (diff) | |
| download | bash-completion-08e746ea109366cd1ba6b52cb02e95c094726876.tar.gz | |
Add pbzip2, pbunzip2, and pbzcat completions.
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | bash_completion | 2 | ||||
| -rw-r--r-- | contrib/bzip2 | 14 |
3 files changed, 12 insertions, 6 deletions
@@ -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 028da881..c9144988 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 68fb7c5a..9001dd58 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 |