diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/.distfiles | 1 | ||||
| -rw-r--r-- | Completion/Unix/Command/_bzip2 | 55 | ||||
| -rw-r--r-- | Completion/Unix/Command/_xz | 85 |
4 files changed, 113 insertions, 33 deletions
@@ -1,5 +1,8 @@ 2012-11-12 Oliver Kiddle <opk@zsh.org> + * 30795: Completion/Unix/Command/_xz, + Completion/Unix/Command/_bzip2: new xz completion, new bzip2 options + * 30794: Completion/Unix/Command/_irssi, Completion/Unix/Command/_mutt: update for new options @@ -327,5 +330,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5758 $ +* $Revision: 1.5759 $ ***************************************************** diff --git a/Completion/Unix/Command/.distfiles b/Completion/Unix/Command/.distfiles index d8cb93965..8b5a173f0 100644 --- a/Completion/Unix/Command/.distfiles +++ b/Completion/Unix/Command/.distfiles @@ -259,6 +259,7 @@ _wiggle _xargs _xmlsoft _xmms2 +_xz _yafc _yodl _yp diff --git a/Completion/Unix/Command/_bzip2 b/Completion/Unix/Command/_bzip2 index 75f051a57..c175e5c90 100644 --- a/Completion/Unix/Command/_bzip2 +++ b/Completion/Unix/Command/_bzip2 @@ -7,38 +7,29 @@ case "$service" in bzip2recover) [[ $CURRENT = 2 ]] && state=files;; bzip2) decompress=no;& bunzip2) _arguments -C -s -S \ - '(--help)-h[display help message]' \ - '(-h)--help[display help message]' \ - '(--decompress --compress -z --test -t)-d[decompress]' \ - '(-d --compress -z --test -t)--decompress[decompress]' \ - '(--compress --decompress -d --test -t)-z[compress]' \ - '(-z --decompress -d --test -t)--compress[compress]' \ - "(--keep)-k[keep (don't delete) input files]" \ - "(-k)--keep[keep (don't delete) input files]" \ - '(--force)-f[force overwrite]' \ - '(-f)--force[force overwrite]' \ - '(--test --decompress -d --compress -z )-t[test compressed file integrity]' \ - '(-t --decompress -d --compress -z )--test[test compressed file integrity]' \ - '(--stdout)-c[write on standard output]' \ - '(-c)--stdout[write on standard output]' \ - '(--quiet)-q[suppress all warnings]' \ - '(-q)--quiet[suppress all warnings]' \ - '*-v[verbose mode]' \ - '*--verbose[verbose mode]' \ - '(--license)-L[display software license]' \ - '(-L)--license[display software license]' \ - '(--version)-V[display version number]' \ - '(-V)--version[display version number]' \ - '(--small)-s[use less memory (at most 2500k)]' \ - '( -2 -3 -4 -5 -6 -7 -8 -9)-1' \ - '(-1 -3 -4 -5 -6 -7 -8 -9)-2' \ - '(-1 -2 -4 -5 -6 -7 -8 -9)-3' \ - '(-1 -2 -3 -5 -6 -7 -8 -9)-4' \ - '(-1 -2 -3 -4 -6 -7 -8 -9)-5' \ - '(-1 -2 -3 -4 -5 -7 -8 -9)-6' \ - '(-1 -2 -3 -4 -5 -6 -8 -9)-7' \ - '(-1 -2 -3 -4 -5 -6 -7 -9)-8' \ - '(-1 -2 -3 -4 -5 -6 -7 -8 )-9' \ + '(- *)'{-h,--help}'[display help message]' \ + '(-d --decompress --compress -z --test -t)'{-d,--decompress}'[decompress]' \ + '(-z --compress --decompress -d --test -t)'{-z,--compress}'[compress]' \ + '(-k --keep)'{-k,--keep}"[keep (don't delete) input files]" \ + '(-f --force)'{-f,--force}'[force overwrite]' \ + '(-t --test --decompress -d --compress -z)'{-t,--test}'[test compressed file integrity]' \ + '(-c --stdout)'{-c,--stdout}'[write on standard output]' \ + '(-q --quiet)'{-q,--quiet}'[suppress all warnings]' \ + \*{-v,--verbose}'[verbose mode]' \ + '(- *)'{-L,--license}'[display software license]' \ + '(- *)'{-V,--version}'[display version number]' \ + '(--small -s)'{-s,--small}'[reduce memory usage (at most 2500k)]' \ + '(-1 -2 -3 -4 -5 -6 -7 -8 -9 --fast )--best' \ + '(-1 -2 -3 -4 -5 -6 -7 -8 -9 --best)--fast' \ + '( -2 -3 -4 -5 -6 -7 -8 -9 --fast --best)-1' \ + '(-1 -3 -4 -5 -6 -7 -8 -9 --fast --best)-2' \ + '(-1 -2 -4 -5 -6 -7 -8 -9 --fast --best)-3' \ + '(-1 -2 -3 -5 -6 -7 -8 -9 --fast --best)-4' \ + '(-1 -2 -3 -4 -6 -7 -8 -9 --fast --best)-5' \ + '(-1 -2 -3 -4 -5 -7 -8 -9 --fast --best)-6' \ + '(-1 -2 -3 -4 -5 -6 -8 -9 --fast --best)-7' \ + '(-1 -2 -3 -4 -5 -6 -7 -9 --fast --best)-8' \ + '(-1 -2 -3 -4 -5 -6 -7 -8 --fast --best)-9' \ '*:files:->files' && ret=0 ;; esac diff --git a/Completion/Unix/Command/_xz b/Completion/Unix/Command/_xz new file mode 100644 index 000000000..028285a35 --- /dev/null +++ b/Completion/Unix/Command/_xz @@ -0,0 +1,85 @@ +#compdef xz unxz xzcat=unxz lzma=xz unlzma=unxz lzcat=unxz -redirect-,<,unxz=unxz -redirect-,>,xz=unxz -redirect-,<,xz=xz -value-,XZ_OPT,-default- -value-,XZ_DEFAULTS,-default- + +local decompress files expl state line curcontext="$curcontext" ret=1 +typeset -A opt_args +local decomp="(-z --compress --decompress -d --test -t --list -l --single-stream --no-sparse)" + +files=( '(--files --files0)*:files:->files' ) +case "$service" in + *XZ_*) + compset -q + words=( fake "$words[@]" ) + (( CURRENT++ )) + files=() + ;& + xz) decompress=no;& + unxz) _arguments -C -s -S "$files[@]" \ + '(- *)'{-h,--help}'[display help message]' \ + '(- *)'{-H,--long-help}'[display the long help (lists also the advanced options)]' \ + '(-d --decompress --compress -z --test -t --list -l)'{-d,--decompress}'[decompress]' \ + "${decomp}"{-z,--compress}'[compress]' \ + '(-k --keep)'{-k,--keep}"[keep (don't delete) input files]" \ + '(-f --force)'{-f,--force}'[force overwrite]' \ + '(-t --test --decompress -d --compress -z --list -l)'{-t,--test}'[test compressed file integrity]' \ + '(-t --test --decompress -d --compress -z --list -l)'{-l,--list}'[list information about .xz files]' \ + '(-c --stdout)'{-c,--stdout}'[write on standard output]' \ + \*{-q,--quiet}'[suppress all warnings]' \ + \*{-v,--verbose}'[verbose mode]' \ + '(- *)'{-V,--version}'[display version number]' \ + '(-e --extreme)'{-e,--extreme}'[try to improve compression ratio by using more CPU time]' \ + '(-1 -2 -3 -4 -5 -6 -7 -8 -9 --fast )--best' \ + '(-1 -2 -3 -4 -5 -6 -7 -8 -9 --best)--fast' \ + '( -2 -3 -4 -5 -6 -7 -8 -9 --fast --best)-1' \ + '(-1 -3 -4 -5 -6 -7 -8 -9 --fast --best)-2' \ + '(-1 -2 -4 -5 -6 -7 -8 -9 --fast --best)-3' \ + '(-1 -2 -3 -5 -6 -7 -8 -9 --fast --best)-4' \ + '(-1 -2 -3 -4 -6 -7 -8 -9 --fast --best)-5' \ + '(-1 -2 -3 -4 -5 -7 -8 -9 --fast --best)-6' \ + '(-1 -2 -3 -4 -5 -6 -8 -9 --fast --best)-7' \ + '(-1 -2 -3 -4 -5 -6 -7 -9 --fast --best)-8' \ + '(-1 -2 -3 -4 -5 -6 -7 -8 --fast --best)-9' \ + "${decomp}--single-stream[decompress only the first stream]" \ + "${decomp}--no-sparse[do not create sparse files when decompressing]" \ + '(* --files --files0)--files=-[read list of files to process from file]::file:_files' \ + '(* --files --files0)--files0=-[read null terminated list of files to process from file]::file:_files' \ + '(-F --format)'{-F,--format}'=[specify file format]:format;(auto xz lzma raw)' \ + '(-C --check)'{-C,--check}'=[integrity check type]:check type:(none crc32 crc64 sha256)' \ + '--memlimit-compress=[set memory usage limit for compression]:memory usage' \ + '--memlimit-decompress=[set memory usage limit for decompression]:memory usage' \ + '(-M --memlimit --memory)'{-M+,--memlimit=,--memory=}'[set memory usage limit]:memory usage' \ + '--no-adjust[give error if settings exceed memory limit]' \ + '(-Q --no-warn)'{-Q,--no-warn}'[make warnings not affect exit status]' \ + '--robot[use machine-parsable messages]' \ + --{x86,powerpc,ia64,arm,armthumb,sparc}=-'[add a branch/call/jump filter]::option:->bcj-options' \ + --lzma{1,2}=-'[add lzma filter]::option:->lzma-options' \ + '--delta=-[add delta filter]::option:->delta-options' \ + '(- *)--info-memory[display amount of RAM and memory usage limits]' && ret=0 + ;; +esac + +case $state in + files) + (( $+opt_args[-z] || $+opt_args[--compress] )) && decompress=no + [[ -n $opt_args[(i)-([dtl]|-decompress|-test|-list)] ]] && unset decompress + if [[ -z "$decompress" ]]; then + _description files expl 'compressed file' + _files "$expl[@]" -g '*.(xz|txz|lzma|tlz)(-.)' && return + else + _description files expl 'file to compress' + _files "$expl[@]" -g '^*.(xz|txz|lzma|tlz)(-.)' && return + fi + ;; + lzma-options) + _values -s , options 'preset:preset' 'dict:size' 'lc:context bits' \ + 'lp:position bits' 'mf:matchfinder:(hc3 hc4 bt2 bt3 bt4)' \ + 'mode:mode:(fast normal)' 'nice:length' 'depth:depth' && ret=0 + ;; + bcj-options) + _values options 'start:offset' && return + ;; + delta-options) + _values options 'dist:distance' && return + ;; +esac + +return ret |