diff options
Diffstat (limited to 'Completion/Debian/Command')
| -rw-r--r-- | Completion/Debian/Command/_a2utils | 4 | ||||
| -rw-r--r-- | Completion/Debian/Command/_apt | 6 | ||||
| -rw-r--r-- | Completion/Debian/Command/_bts | 64 | ||||
| -rw-r--r-- | Completion/Debian/Command/_lighttpd | 8 | ||||
| -rw-r--r-- | Completion/Debian/Command/_lintian | 4 | ||||
| -rw-r--r-- | Completion/Debian/Command/_pbuilder | 4 | ||||
| -rw-r--r-- | Completion/Debian/Command/_wajig | 2 |
7 files changed, 72 insertions, 20 deletions
diff --git a/Completion/Debian/Command/_a2utils b/Completion/Debian/Command/_a2utils index 46126282f..8ee30ecf1 100644 --- a/Completion/Debian/Command/_a2utils +++ b/Completion/Debian/Command/_a2utils @@ -1,6 +1,6 @@ #compdef a2ensite a2dissite a2enmod a2dismod -local -a mods +local -a expl mods case "$service" in a2ensite) @@ -21,4 +21,4 @@ case "$service" in ;; esac -return 0 +return diff --git a/Completion/Debian/Command/_apt b/Completion/Debian/Command/_apt index cd0783b4f..074fb0164 100644 --- a/Completion/Debian/Command/_apt +++ b/Completion/Debian/Command/_apt @@ -525,7 +525,7 @@ _apt-cache () { --installed:bool \ -- \ /$'help\0'/ \| \ - /$'add\0'/ /$'[^\0]#\0'/ ':files:index files:_files "$expl[@]"' \# \| \ + /$'add\0'/ /$'[^\0]#\0'/ ':files:index files:_files' \# \| \ /$'gencaches\0'/ \| \ /$'showpkg\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \ /$'showsrc\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \ @@ -595,10 +595,10 @@ _apt-config () { /$'shell\0'/ \ \( \ /$'[^\0]#\0'/ ':parameters:shell variable to assign:_parameters' \ - /$'[^\0]#\0'/ ':values:configuration key:compadd "$expl[@]" - ${${(f)"$(apt-config dump 2>&1)"}% *}' \ + /$'[^\0]#\0'/ ':values:configuration key:compadd - ${${(f)"$(apt-config dump 2>&1)"}% *}' \ \) \# \| \ /$'dump\0'/ \| \ - /"[]"/ ':argument-1:action:compadd "$expl[@]" shell dump' + /"[]"/ ':argument-1:action:compadd shell dump' _apt-config "$@" } diff --git a/Completion/Debian/Command/_bts b/Completion/Debian/Command/_bts index f415989b9..70b95ef96 100644 --- a/Completion/Debian/Command/_bts +++ b/Completion/Debian/Command/_bts @@ -22,16 +22,18 @@ compset -N '[,.]' && first=0 [[ $first -eq 0 ]] || compset -n 2 if [[ CURRENT -eq 1 ]]; then - _wanted cmd expl 'bts command' compadd show bugs close reopen retitle \ + _wanted cmd expl 'bts command' compadd show bugs reopen retitle \ reassign merge unmerge tag tags severity forwarded notforwarded help \ clone submitter found notfound block unblock user usertag usertags \ package owner noowner reportspam cache cleancache claim unclaim \ - subscribe unsubscribe fixed notfixed affects + subscribe unsubscribe fixed notfixed affects spamreport status \ + select done archive unarchive summary forcemerge limit listcachedbugs \ + version return fi case "$words[1]" in - (close|unmerge|notforwarded|noowner|reportspam) + (unmerge|notforwarded|noowner|reportspam|spamreport|archive|unarchive) if [[ CURRENT -eq 2 ]]; then _debbugs_bugnumber else @@ -75,7 +77,10 @@ case "$words[1]" in _wanted sep expl 'separator' compadd -S ' ' , . fi ;; - merge) + (status) + # TODO: some additional syntaxes aren't being completed. + ;& + (merge|forcemerge) _debbugs_bugnumber if [[ CURRENT -gt 2 ]]; then _wanted sep expl 'separator' compadd -S ' ' , . @@ -208,8 +213,10 @@ case "$words[1]" in ;; (cleancache) _alternative \ - 'package:package:_deb_packages avail' \ - 'email:email address:_email_addresses -c' \ + 'source-packages:source package:_deb_packages -P "src:" source' \ + 'package:binary package:_deb_packages avail' \ + 'email:email address:_email_addresses -c -P "from:"' \ + 'bugnum:bug number:_debbugs_bugnumber' \ 'all:all:compadd ALL' ;; (claim|unclaim) @@ -232,6 +239,51 @@ case "$words[1]" in _wanted package expl 'package' _deb_packages avail fi ;; + (summary) + case $CURRENT in + (2) _debbugs_bugnumber;; + (3) _message -e message-number 'message number';& + (4) _wanted sep expl 'separator' compadd -S ' ' , .;; + esac + ;; + (close|done) + case $CURRENT in + (2) _debbugs_bugnumber;; + (3) _message -e version 'version';& + (4) _wanted sep expl 'separator' compadd -S ' ' , .;; + esac + ;; + (select) + _values -S : -w "select field" \ + '*package[binary package]: :_deb_packages avail' \ + '*source[source package]: :_deb_packages source' \ + '*maintainer:email address of the maintainer:_email_addresses -c' \ + '*submitter:email address of the submitter:_email_addresses -c' \ + '*severity:severity:(wishlist minor normal important serious grave critical)' \ + '*tag[tags applied to the bug]:tags:' \ + '*owner:owner:_email_addresses -c' \ + '*correspondent:email address of a correspondent:_email_addresses -c' \ + '*affects:affected package:_deb_packages avail' \ + '*users:namespaces of usertags:_email_addresses -c' \ + '*archive:whether to search archived bugs:((0:no 1:yes both:both))' + # undocumented: bugs + _wanted sep expl 'separator' compadd -S ' ' , . + ;; + (limit) + _values -S : -w "limit field" \ + '*submitter[email address of the submitter]:submitter:_email_addresses -c' \ + '*date[bug submission timestamp]:unix timestamp' \ + '*subject[subject of the bug]:bug subject:' \ + '*msgid[message-id of the initial bug report]:message-id:' \ + '*package[binary package]: :_deb_packages avail' \ + '*source[source package]: :_deb_packages source' \ + '*tag[tags applied to the bug]:tags:' \ + '*severity:severity:(wishlist minor normal important serious grave critical)' \ + '*owner:owner:_email_addresses -c' \ + '*affects:affected package:_deb_packages avail' \ + '*archive:whether to search archived bugs:((0:no 1:yes both:both))' + _wanted sep expl 'separator' compadd -S ' ' , . + ;; help) ;& *) _wanted sep expl 'separator' compadd -S ' ' , . diff --git a/Completion/Debian/Command/_lighttpd b/Completion/Debian/Command/_lighttpd index 7f4385b90..c24b42d13 100644 --- a/Completion/Debian/Command/_lighttpd +++ b/Completion/Debian/Command/_lighttpd @@ -1,16 +1,16 @@ #compdef lighty-enable-mod lighty-disable-mod -local -a mods +local -a mods expl case "$service" in lighty-enable-mod) mods=( `echo /etc/lighttpd/conf-available/*.conf(N:r:t) | sed -e 's/\b[0-9][0-9]-//g'` ) - _wanted mods expl mods compadd -a mods + _wanted mods expl mod compadd -a mods ;; lighty-disable-mod) mods=( `echo /etc/lighttpd/conf-enabled/*.conf(N:r:t) | sed -e 's/\b[0-9][0-9]-//g'` ) - _wanted mods expl mods compadd -a mods + _wanted mods expl mod compadd -a mods ;; esac -return 0 +return diff --git a/Completion/Debian/Command/_lintian b/Completion/Debian/Command/_lintian index 16af5085b..d60acc9ed 100644 --- a/Completion/Debian/Command/_lintian +++ b/Completion/Debian/Command/_lintian @@ -1,6 +1,6 @@ #compdef lintian lintian-info -local line cmds ret=1 +local curcontext="$curcontext" state line expl cmds ret=1 case "$service" in (lintian) @@ -55,7 +55,7 @@ case "$service" in (args) case $line[1] in -t|--tags) - _wanted tag expl 'tag' compadd $(command awk '/^Tag:/ { print $2 }' /usr/share/lintian/checks/*.desc) && ret=0 + _wanted tags expl 'tag' compadd $(command awk '/^Tag:/ { print $2 }' /usr/share/lintian/checks/*.desc) && ret=0 ;; esac ;; diff --git a/Completion/Debian/Command/_pbuilder b/Completion/Debian/Command/_pbuilder index 9322d036a..6377538b2 100644 --- a/Completion/Debian/Command/_pbuilder +++ b/Completion/Debian/Command/_pbuilder @@ -14,8 +14,8 @@ else '--buildresult:location:_files -/' \ '--mirror:URL:_urls' \ '--othermirror:URL:_urls' \ - '--distribution:suite:(breezy dapper edgy etch feisty gutsy hardy hoary intrepid jaunty jessie karmic lenny lucid potato sarge sid squeeze warty woody' \ - '--architecture:architecture:i_deb_architectures' \ + '--distribution:codename:_deb_codenames' \ + '--architecture:architecture:_deb_architectures' \ '--components:component:(main contrib non-free)' \ '--override-config' \ '--hookdir:location:_files -/' \ diff --git a/Completion/Debian/Command/_wajig b/Completion/Debian/Command/_wajig index 350eee658..26d08cfd7 100644 --- a/Completion/Debian/Command/_wajig +++ b/Completion/Debian/Command/_wajig @@ -1,6 +1,6 @@ #compdef wajig -local curcontext="$curcontext" state line cmds argno ret=1 +local curcontext="$curcontext" state line expl cmds argno ret=1 _arguments -C -s \ '(- 1 *)'{-h,--help}'[print usage message]' \ |