PATCH: _apt

PATCH: _apt

[Clint Adams]

Modernization of apt-cache completion.

Index: Completion/Debian/Command/_apt
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Debian/Command/_apt,v
retrieving revision 1.2
diff -u -r1.2 _apt
--- Completion/Debian/Command/_apt	2001/05/25 14:34:51	1.2
+++ Completion/Debian/Command/_apt	2001/12/14 17:40:14
@@ -449,7 +449,10 @@
     -q,--quiet:intlevel \
     -i,--important:bool \
     -f,--full:bool \
+    -g,--generate:bool \
     --names-only:bool \
+    --all-names:bool \
+    --recurse:bool \
     -c,--config-file:configfile \
     -o,--option:arbitem \
     -- \
@@ -465,7 +468,10 @@
     /$'search\0'/ /$'[^\0]#\0'/ ':strings:pattern:' \| \
     /$'show\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \
     /$'depends\0'/ \| \
-    /"[]"/ ':argument-1::compadd "$expl_action[@]" help add gencaches showpkg stats dump dumpavail unmet check search show depends'
+    /$'pkgnames\0'/ \| \
+    /$'dotty\0'/ \| \
+    /$'policy\0'/ \| \
+    /"[]"/ ':argument-1::compadd "$expl_action[@]" help add gencaches showpkg stats dump dumpavail unmet check search show depends pkgnames dotty policy'
 
   _apt-cache () {
     local expl_action expl_packages expl_pkg_cache expl_src_cache

PATCH: _apt

[Clint Adams]

Catching up with modern apt.

Index: Completion/Debian/Command/_apt
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Debian/Command/_apt,v
retrieving revision 1.10
diff -u -r1.10 _apt
--- Completion/Debian/Command/_apt	24 Apr 2005 17:49:54 -0000	1.10
+++ Completion/Debian/Command/_apt	13 Jun 2005 21:22:26 -0000
@@ -419,6 +419,7 @@
     --diff-only:bool \
     --tar-only:bool \
     --arch-only:bool \
+    --allow-unauthenticated:bool \
     -- \
     /$'update\0'/ \| \
     /$'upgrade\0'/ \| \
@@ -481,6 +482,7 @@
     /$'dotty\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \
     /$'xvcg\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \
     /$'policy\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \
+    /$'madison\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \
     /"[]"/ ':argument-1::compadd "$expl_action[@]" help add gencaches showpkg showsrc stats dump dumpavail unmet search show depends rdepends pkgnames dotty policy xvcg'
 
   _apt-cache () {

PATCH: _apt

[Clint Adams]

policy can take an argument.  Patch from Dennis Haney <davh@davh.dk>.

Index: Completion/Debian/Command/_apt
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Debian/Command/_apt,v
retrieving revision 1.4
diff -u -r1.4 _apt
--- Completion/Debian/Command/_apt	16 Jan 2002 23:25:50 -0000	1.4
+++ Completion/Debian/Command/_apt	12 Apr 2002 23:30:07 -0000
@@ -471,7 +471,7 @@
     /$'depends\0'/ \| \
     /$'pkgnames\0'/ \| \
     /$'dotty\0'/ \| \
-    /$'policy\0'/ \| \
+    /$'policy\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \
     /"[]"/ ':argument-1::compadd "$expl_action[@]" help add gencaches showpkg stats dump dumpavail unmet check search show depends pkgnames dotty policy'
 
   _apt-cache () {

PATCH: _apt

[Tanaka Akira]

This patch fix following problem.

% apt-get --no-<TAB>
_alternative:68: unknown sort specifier
_alternative:70: command not found: t
% apt-get --no-
option
--no-           --no-act        --no-download   --no-upgrade  

Index: Completion/Debian/_apt
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Debian/_apt,v
retrieving revision 1.8
diff -u -r1.8 _apt
--- Completion/Debian/_apt	2000/06/22 08:42:36	1.8
+++ Completion/Debian/_apt	2000/11/22 08:54:49
@@ -97,13 +97,13 @@
 _describe -o option tmp2 -- tmp3 -S= -- bool_prefix -S ""'
 
   comp_long_prefix=\
-'tmp1="${(j:|:)${(@)${(@M)${(@s:,:)${(@kj:,:)num_options[(R)*~0]}}:#--*}#--}}"
+'{tmp1="${(j:|:)${(@)${(@M)${(@s:,:)${(@kj:,:)num_options[(R)*~0]}}:#--*}#--}}"
 tmp2=($_ra_left${(M)^long_bool:#$~tmp1} $_ra_left${(M)^long_intlevel:#$~tmp1})
 tmp3=($_ra_left${(M)^long_hasarg:#$~tmp1} $_ra_left${(M)^long_configfile:#$~tmp1} $_ra_left${(M)^long_arbitem:#$~tmp1})
 tmp1="${(j:|:)${(@)${(@M)${(@s:,:)${(@kj:,:)num_options[(R)*~0]}}:#-?}#-}}"
 tmp2=("$tmp2[@]" $_ra_left${(M)^short_bool:#$~tmp1} $_ra_left${(M)^short_intlevel:#$~tmp1})
 tmp3=("$tmp3[@]" $_ra_left${(M)^short_hasarg:#$~tmp1} $_ra_left${(M)^short_configfile:#$~tmp1} $_ra_left${(M)^short_arbitem:#$~tmp1})
-_describe -o option tmp2 -- tmp3 -S='
+_describe -o option tmp2 -- tmp3 -S=}'
 
   comp_opt='{{ ! zstyle -T ":completion:${curcontext}:options" prefix-needed || [[ "$PREFIX" = -* ]] }'" && { $comp_short; $comp_long }}"
   comp_short="{$comp_short}"
-- 
Tanaka Akira