From dcad2ef17be67ec19a74fc735a81dd02daf4a12d Mon Sep 17 00:00:00 2001 From: axel Date: Wed, 31 Jan 2007 01:34:35 +1000 Subject: [PATCH] Switch various completions to the simpler format for __fish_complete_suffix darcs-hash:20070130153435-ac50b-abe42f3f464cb96db062c83084d97ef377a72e80.gz --- share/completions/at.fish | 2 +- share/completions/bunzip2.fish | 12 ++++++++---- share/completions/bzcat.fish | 13 +++++++++---- share/completions/bzip2.fish | 13 +++++++++---- share/completions/bzip2recover.fish | 11 +++++++---- share/completions/dvipdf.fish | 2 +- share/completions/dvipdfm.fish | 7 ++++--- share/completions/gunzip.fish | 10 ++-------- share/completions/gzip.fish | 4 ++-- share/completions/ps2pdf.fish | 2 +- share/completions/rpm.fish | 6 +++--- share/completions/zcat.fish | 4 ++-- 12 files changed, 49 insertions(+), 37 deletions(-) diff --git a/share/completions/at.fish b/share/completions/at.fish index 59a35e059..c23e83eea 100644 --- a/share/completions/at.fish +++ b/share/completions/at.fish @@ -2,7 +2,7 @@ complete -f -c at -s V --description "Display version and exit" complete -f -c at -s q --description "Use specified queue" complete -f -c at -s m --description "Send mail to user" -complete -c at -s f -x -a "(__fish_complete_suffix (commandline -ct) '' 'At job')" --description "Read job from file" +complete -c at -s f -x -a "(__fish_complete_suffix (commandline -ct) '' 'At job')" --description "Read job from file" complete -f -c at -s l --description "Alias for atq" complete -f -c at -s d --description "Alias for atrm" complete -f -c at -s v --description "Show the time" diff --git a/share/completions/bunzip2.fish b/share/completions/bunzip2.fish index 33088cc26..9ce816da5 100644 --- a/share/completions/bunzip2.fish +++ b/share/completions/bunzip2.fish @@ -1,8 +1,12 @@ complete -c bunzip2 -x -a "( - __fish_complete_suffix (commandline -ct) .bz 'Compressed file' - __fish_complete_suffix (commandline -ct) .bz2 'Compressed file' - __fish_complete_suffix (commandline -ct) .tbz 'Compressed archive' - __fish_complete_suffix (commandline -ct) .tbz2 'Compressed archive' + __fish_complete_suffix .tbz + __fish_complete_suffix .tbz2 +) +" + +complete -c bunzip2 -x -a "( + __fish_complete_suffix .bz + __fish_complete_suffix .bz2 ) " diff --git a/share/completions/bzcat.fish b/share/completions/bzcat.fish index c9bb8f94a..9e0c48084 100644 --- a/share/completions/bzcat.fish +++ b/share/completions/bzcat.fish @@ -1,8 +1,13 @@ complete -c bzcat -x -a "( - __fish_complete_suffix (commandline -ct) .bz 'Compressed file' - __fish_complete_suffix (commandline -ct) .bz2 'Compressed file' - __fish_complete_suffix (commandline -ct) .tbz 'Compressed archive' - __fish_complete_suffix (commandline -ct) .tbz2 'Compressed archive' + __fish_complete_suffix .tbz + __fish_complete_suffix .tbz2 ) " + +complete -c bzcat -x -a "( + __fish_complete_suffix .bz + __fish_complete_suffix .bz2 +) +" + complete -c bzcat -s s -l small --description "Reduce memory usage" diff --git a/share/completions/bzip2.fish b/share/completions/bzip2.fish index 079cc55b9..2365de604 100644 --- a/share/completions/bzip2.fish +++ b/share/completions/bzip2.fish @@ -1,11 +1,16 @@ complete -c bzip2 -s c -l stdout --description "Compress to stdout" complete -c bzip2 -s d -l decompress -x -a "( - __fish_complete_suffix (commandline -ct) .bz 'Compressed file' - __fish_complete_suffix (commandline -ct) .bz2 'Compressed file' - __fish_complete_suffix (commandline -ct) .tbz 'Compressed archive' - __fish_complete_suffix (commandline -ct) .tbz2 'Compressed archive' + __fish_complete_suffix .tbz + __fish_complete_suffix .tbz2 ) " + +complete -c bzip2 -s d -l decompress -x -a "( + __fish_complete_suffix .bz + __fish_complete_suffix .bz2 +) +" + complete -c bzip2 -s z -l compress --description "Compress file" complete -c bzip2 -s t -l test --description "Check integrity" complete -c bzip2 -s f -l force --description "Overwrite" diff --git a/share/completions/bzip2recover.fish b/share/completions/bzip2recover.fish index 2ac17f46a..756c3f99f 100644 --- a/share/completions/bzip2recover.fish +++ b/share/completions/bzip2recover.fish @@ -1,8 +1,11 @@ complete -c bzip2recover -x -a "( - __fish_complete_suffix (commandline -ct) .bz 'Compressed file' - __fish_complete_suffix (commandline -ct) .bz2 'Compressed file' - __fish_complete_suffix (commandline -ct) .tbz 'Compressed archive' - __fish_complete_suffix (commandline -ct) .tbz2 'Compressed archive' + __fish_complete_suffix .tbz + __fish_complete_suffix .tbz2 ) " +complete -c bzip2recover -x -a "( + __fish_complete_suffix .bz + __fish_complete_suffix .bz2 +) +" diff --git a/share/completions/dvipdf.fish b/share/completions/dvipdf.fish index 1dd4f5197..8c8a83544 100644 --- a/share/completions/dvipdf.fish +++ b/share/completions/dvipdf.fish @@ -1,3 +1,3 @@ complete -c dvipdf -x -a "( - __fish_complete_suffix (commandline -ct) .dvi 'DVI file' + __fish_complete_suffix .dvi )" diff --git a/share/completions/dvipdfm.fish b/share/completions/dvipdfm.fish index 18efbe413..c49b469e7 100644 --- a/share/completions/dvipdfm.fish +++ b/share/completions/dvipdfm.fish @@ -1,3 +1,4 @@ -complete -c dvipdfm -x -a "( - __fish_complete_suffix (commandline -ct) .dvi 'DVI file' - )" +complete -c dvipdfm -x -a " +( + __fish_complete_suffix .dvi +)" diff --git a/share/completions/gunzip.fish b/share/completions/gunzip.fish index 9e776fbaa..b4ffd18a0 100644 --- a/share/completions/gunzip.fish +++ b/share/completions/gunzip.fish @@ -1,7 +1,7 @@ complete -c gunzip -s c -l stdout --description "Compress to stdout" complete -c gunzip -x -a "( - __fish_complete_suffix (commandline -ct) .gz 'Compressed file' - __fish_complete_suffix (commandline -ct) .tgz 'Compressed archive' + __fish_complete_suffix .gz + __fish_complete_suffix .tgz ) " complete -c gunzip -s f -l force --description "Overwrite" @@ -17,9 +17,3 @@ complete -c gunzip -s t -l test --description "Check integrity" complete -c gunzip -s v -l verbose --description "Display compression ratios" complete -c gunzip -s V -l version --description "Display version and exit" -complete -c gunzip -x -a "( - __fish_complete_suffix (commandline -ct) .gz 'Compressed file' - __fish_complete_suffix (commandline -ct) .tgz 'Compressed archive' -) -" - diff --git a/share/completions/gzip.fish b/share/completions/gzip.fish index c814f33d2..10c5b8ab3 100644 --- a/share/completions/gzip.fish +++ b/share/completions/gzip.fish @@ -1,8 +1,8 @@ complete -c gzip -s c -l stdout --description "Compress to stdout" complete -c gzip -s d -l decompress -x -a " ( - __fish_complete_suffix (commandline -ct) .gz 'Compressed file' - __fish_complete_suffix (commandline -ct) .tgz 'Compressed archive' + __fish_complete_suffix .gz + __fish_complete_suffix .tgz ) " diff --git a/share/completions/ps2pdf.fish b/share/completions/ps2pdf.fish index 7ddc57993..05975ced5 100644 --- a/share/completions/ps2pdf.fish +++ b/share/completions/ps2pdf.fish @@ -1,3 +1,3 @@ complete -c ps2pdf -x -a "( - __fish_complete_suffix (commandline -ct) .ps 'PostScript file' + __fish_complete_suffix .ps )" diff --git a/share/completions/rpm.fish b/share/completions/rpm.fish index eda36734e..03b39514c 100644 --- a/share/completions/rpm.fish +++ b/share/completions/rpm.fish @@ -80,9 +80,9 @@ complete $rpm_select -s f -l file --description 'Query package owning specified complete $rpm_select -l fileid --description 'Query package that contains a given file identifier, i.e. the MD5 digest of the file contents' -x complete $rpm_select -s g -l group --description 'Query packages with the specified group' -x complete $rpm_select -l hdrid --description 'Query package that contains a given header identifier, i.e. the SHA1 digest of the immutable header region' -x -complete $rpm_select -s p -l package --description 'Query an (uninstalled) package in specified file' -xa "(__fish_complete_suffix (commandline -ct) .rpm 'Query package file')" +complete $rpm_select -s p -l package --description 'Query an (uninstalled) package in specified file' -xa "(__fish_complete_suffix .rpm)" complete $rpm_select -l pkgid --description 'Query package that contains a given package identifier, i.e. the MD5 digest of the combined header and payload contents' -x -complete $rpm_select -l specfile --description 'Parse and query specified spec-file as if it were a package' -xa "(__fish_complete_suffix (commandline -ct) .spec 'Query package spec file')" +complete $rpm_select -l specfile --description 'Parse and query specified spec-file as if it were a package' -xa "(__fish_complete_suffix .spec)" complete $rpm_select -l tid --description 'Query package(s) that have the specified TID (transaction identifier)' -x complete $rpm_select -l triggeredby --description 'Query packages that are triggered by the specified packages' -x -a "(__fish_print_packages)" complete $rpm_select -l whatprovides --description 'Query all packages that provide the specified capability' -x @@ -128,4 +128,4 @@ complete $rpm_mode -s V -l verify --description 'Verify package integrity' complete $rpm_mode -s e -l erase --description 'Erase package' set -e rpm_mode -complete -c rpm -xa '(__fish_complete_suffix (commandline -ct) .rpm (_ "Package") )' +complete -c rpm -xa '(__fish_complete_suffix .rpm)' diff --git a/share/completions/zcat.fish b/share/completions/zcat.fish index 0c952d774..ddb80bb04 100644 --- a/share/completions/zcat.fish +++ b/share/completions/zcat.fish @@ -1,6 +1,6 @@ complete -c zcat -x -a "( - __fish_complete_suffix (commandline -ct) .gz 'Compressed file' - __fish_complete_suffix (commandline -ct) .tgz 'Compressed archive' + __fish_complete_suffix .gz + __fish_complete_suffix .tgz ) " complete -c zcat -s f -l force --description "Overwrite"