summaryrefslogtreecommitdiff
path: root/Completion/Debian/Command
diff options
context:
space:
mode:
Diffstat (limited to 'Completion/Debian/Command')
-rw-r--r--Completion/Debian/Command/_apt2
-rw-r--r--Completion/Debian/Command/_aptitude115
-rw-r--r--Completion/Debian/Command/_axi-cache2
-rw-r--r--Completion/Debian/Command/_dak14
-rw-r--r--Completion/Debian/Command/_debsnap77
-rw-r--r--Completion/Debian/Command/_dpkg2
-rw-r--r--Completion/Debian/Command/_dscverify26
-rw-r--r--Completion/Debian/Command/_git-buildpackage6
-rw-r--r--Completion/Debian/Command/_lintian6
-rw-r--r--Completion/Debian/Command/_madison2
-rw-r--r--Completion/Debian/Command/_module-assistant2
11 files changed, 188 insertions, 66 deletions
diff --git a/Completion/Debian/Command/_apt b/Completion/Debian/Command/_apt
index 4d60cd249..494d3bf82 100644
--- a/Completion/Debian/Command/_apt
+++ b/Completion/Debian/Command/_apt
@@ -531,7 +531,7 @@ _apt-cache () {
--installed:bool \
-- \
/$'help\0'/ \| \
- /$'add\0'/ /$'[^\0]#\0'/ ':files:index files:_files' \# \| \
+ /$'add\0'/ /$'[^\0]#\0'/ ':files:index file:_files' \# \| \
/$'gencaches\0'/ \| \
/$'showpkg\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \
/$'showsrc\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \
diff --git a/Completion/Debian/Command/_aptitude b/Completion/Debian/Command/_aptitude
index bbaa8ebbd..5b10adb80 100644
--- a/Completion/Debian/Command/_aptitude
+++ b/Completion/Debian/Command/_aptitude
@@ -1,60 +1,32 @@
#compdef aptitude
-local curcontext="$curcontext" state line cmds ret=1
-
-function _aptitude_release() {
- #{{{
- local expl releases
- releases=(
-${${(M)${(f)"$(</etc/apt/sources.list)"}\
-:#[ $'\t']#deb(|-src)*}/(#b)[ $'\t']#[^ $'\t']##[ $'\t']##[^ $'\t']##[ $'\t']##([^ $'\t']##)*/$match[1]}
- )
- _wanted list expl release compadd ${expl} - ${(u)releases}
- #}}}
-}
-
-# Helper function for -F / --display-format
-function _aptitude_format_strings() {
- _values -s , 'format string' \
- '%%[Literal %]' \
- '%#number[Parameter replacement]' \
- '%a[Action flag]' \
- '%A[Action]' \
- '%B[Broken count]' \
- '%c[Current state flag]' \
- '%C[Current state]' \
- '%d[Description]' \
- '%H[Hostname]' \
- '%i[Pin priority]' \
- '%I[Installed size]' \
- '%m[Maintainer]' \
- '%M[Automatic flag]' \
- '%n[Program version]' \
- '%N[Program name]' \
- '%o[Download size]' \
- '%p[Package name]' \
- '%P[Priority]' \
- '%r[Reverse depends count]' \
- '%R[Abbreviated priority]' \
- '%s[Section]' \
- '%S[Trust status]' \
- '%t[Archive]' \
- '%T[Tagged]' \
- '%u[Disk usage change]' \
- '%v[Current version]' \
- '%V[Candidate version]' \
- '%Z[Size change]'
-}
+local curcontext="$curcontext" sep ret=1
+local state line expl specs disp cmds suf
_arguments -C \
'(- 1 *)'{-h,--help}'[display help information]' \
'(- 1 *)--version[display version information]' \
+ '--add-user-tag=[add user tag to affected packages]:tag' \
+ '--add-user-tag-to=[add user tag to matching packages]:tag,pattern' \
+ '--allow-new-upgrades[install upgrades for packages regardless]' \
+ '(--no-new-installs)--allow-new-installs[allow the safe-upgrade command to install new packages]' \
+ '--allow-untrusted[install packages from untrusted sources without prompting]' \
+ '--disable-columns[output results without any special formatting]' \
+ '(-F --display-format)'{-F,--display-format}'[specify output format for search command]:format:->format-strings' \
+ '--group-by=[control how the versions command groups its output]:grouping:(archive auto none package source-package source-version)' \
+ '--log-file=[specify output log file]:file:_files' \
+ '*--log-level=[specify minimum message level to log]:level:compadd -o nosort off fatal error warn info debug trace' \
+ '--log-resolver[set some standard log levels related to the resolver]' \
+ '(--allow-new-installs)--no-new-installs[prevent safe-upgrade from installing any new packages]' \
+ '(--allow-new-upgrades)--no-new-upgrades[prevent safe-upgrade from upgrading packages regardless]' \
+ "--no-show-resolver-actions[don't display the actions performed by the “safe” resolver]" \
+ '(-O --sort)'{-O,--sort}'[specify sort order]:sort order:->orderings' \
+ '-o[set a configuration file option]:key=value' \
'(-s --simulate)'{-s,--simulate}'[print actions without performing them]' \
'(-d --download-only)'{-d,--download-only}"[just download packages - don\'t install]" \
'(-P --prompt)'{-P,--prompt}'[always display a prompt]' \
+ '--purge-unused[purge in addition to removing each package that is no longer required]' \
'(-y --assume-yes)'{-y,--assume-yes}'[assume yes answer to questions]' \
- '(-F --display-format)'{-F,--display-format}'[specify output format for search command]:format:_aptitude_format_strings' \
- '(-O --sort)'{-O,--sort}'[specify sort order]:sort order:()' \
'(-w --width)'{-w,--width}'[specify output width]:width' \
'-f[aggressively try to fix dependencies of broken packages]' \
'(-V --show-versions)'{-V,--show-versions}'[show which versions of packages will be installed]' \
@@ -65,25 +37,72 @@ _arguments -C \
'(--without-suggests)--with-suggests[install suggested packages when installing new packages]' \
'(-r --with-recommends)'{-r,--without-recommends}'[ignore recommended packages when installing new packages]' \
'(--with-suggests)--without-suggests[ignore suggested packages when installing new packages]' \
- '(-t --target-release)'{-t,--target-release}'[set the release from which packages should be installed]:release:_aptitude_release' \
+ '--remove-user-tag=[remove user tag from affected packages]:tag' \
+ '--remove-user-tag-from=[remove user tag from matching packages]:tag,pattern' \
+ '(-t --target-release)'{-t,--target-release}'[set the release from which packages should be installed]:release:->aptitude-releases' \
'(-q --quiet)'{-q=,--quiet=}'[less Output]:level' \
'--schedule-only[schedule operations to be performed in the future]' \
'--purge-unused[purge unused packages instead of removing]' \
'--visual-preview[start up the visual interface and display its preview screen]' \
'--full-resolver[attempts to resolve conflicts with a higher risk of breakage]' \
'--safe-resolver[attempts to resolve conflicts with a lower risk of breakage]' \
+ '--show-package-names[control when the versions command shows package names]:when:(always auto never)' \
+ '--show-summary=[summarize each dependency chain that the why command outputs]::mode:(no-summary first-package first-package-and-type all-packages all-packages-with-dep-versions)' \
+ '(-W --show-why)'{-W,--show-why}'[show which manually installed package requires each automatically installed package]' \
'-S[load the extended state information from non-standard state file]:state file:_files' \
'-u[begin updating the package lists as soon as the program starts]' \
'-i[displays a download preview when the program starts]' \
+ '-Z[show how much disk space will be used or freed by the individual packages]' \
'1: :->cmds' \
'*: :->args' && ret=0
case $state in
+ aptitude-releases)
+ releases=(
+ ${${(M)${(f)"$(</etc/apt/sources.list)"}\
+:#[ $'\t']#deb(|-src)*}/(#b)[ $'\t']#[^ $'\t']##[ $'\t']##[^ $'\t']##[ $'\t']##([^ $'\t']##)*/$match[1]}
+ )
+ _description releases expl release
+ compadd "$expl[@]" -a releases && ret=0
+ ;;
cmds)
cmds=( ${${(M)${(f)"$(_call_program commands aptitude -h 2>/dev/null)"}:# [^- ][^ ]## *}/(#b) ([^ ]##) ##(- )#([^- ]*)/$match[1]:$match[3]:l})
_describe -t commands 'aptitude command' cmds && ret=0
;;
+ format-strings)
+ compset -P '(%\#[0-9]|%[A-Za-z%]|[^%])#'
+ compset -S '*'
+ zstyle -s ":completion:${curcontext}:format-specifiers" list-separator sep || sep=--
+ specs=(
+ '%%:literal %' '%#:parameter replacement' '%a:action flag'
+ '%A:action' '%B:broken count' '%c:current state flag'
+ '%C:current state' '%d:description' '%D:package size'
+ '%E:architecture' '%H:hostname' '%i:pin priority'
+ '%I:installed size' '%m:maintainer' '%M:automatic flag'
+ '%n:program version' '%N:program name' '%o:download size'
+ '%O:origin' '%p:package name' '%P:priority'
+ '%r:reverse depends count' '%R:abbreviated priority' '%s:section'
+ '%S:trust status' '%t:archive' '%T:tagged'
+ '%u:disk usage change' '%v:current version' '%V:candidate version'
+ '%Z:size change'
+ )
+ zformat -a disp " $sep " $specs
+ _description format-specifiers expl 'format specifier'
+ compadd "$expl[@]" -S '' -d disp - ${specs%:*}
+ ;;
+ orderings)
+ line=( "${(@)${(@)${(@s.,.)PREFIX}#(\\|)\~}[1,-2]}" )
+ compset -P '*,'
+ compset -S ',*' || suf=( -qS , )
+ if ! compset -P '(\\|)~'; then
+ _description prefixes expl 'reverse order'
+ compadd "$expl[@]" -S '' \~ && ret=0
+ fi
+ _description sort-key expl 'order [name,version]'
+ compadd -F line "$expl[@]" $suf - installsize installsizechange debsize \
+ name priority version && ret=0
+ ;;
args)
case $line[1] in
search)
diff --git a/Completion/Debian/Command/_axi-cache b/Completion/Debian/Command/_axi-cache
index bdefdd979..5fd4c38f8 100644
--- a/Completion/Debian/Command/_axi-cache
+++ b/Completion/Debian/Command/_axi-cache
@@ -10,7 +10,7 @@ _arguments \
'*:args:->args' && return 0
if (( CURRENT == 2 )); then
- _wanted tag expl 'axi-cache commands' \
+ _wanted tag expl 'axi-cache command' \
compadd help search more last show again info \
rdetails depends madison policy showpkg showsrc
else
diff --git a/Completion/Debian/Command/_dak b/Completion/Debian/Command/_dak
index 086196c4a..9976c7371 100644
--- a/Completion/Debian/Command/_dak
+++ b/Completion/Debian/Command/_dak
@@ -27,7 +27,7 @@ case $cmd in
'(-G --greaterthan)'{-G,--greaterthan}
'(-r --regex)'{-r,--regex}
'(-s --suite)'{-s,--suite=}':suite:_values -s , "suite list" oldstable stable testing unstable experimental'
- '(-S, --source-and-binary)'{-S,--source-and-binary}
+ '(-S --source-and-binary)'{-S,--source-and-binary}
'*:package:_deb_packages avail'
)
;;
@@ -75,7 +75,7 @@ case $cmd in
'(-p --partial)'{-p,--partial}'[do not affect override files]'
'(-R --rdep-check)'{-R,--rdep-check}'[check reverse dependencies]'
'(-s --suite)'{-s,--suite=}':suite:_values -s , "suite list" oldstable stable testing unstable experimental'
- '(-S, --source-only)'{-S,--source-only}'[remove source only]'
+ '(-S --source-only)'{-S,--source-only}'[remove source only]'
'*:package:_deb_packages avail'
)
;;
@@ -155,10 +155,10 @@ case $cmd in
'(-c --component)'{-c,--component=}':component:(main contrib non-free)'
'(-s --suite)'{-s,--suite=}':suite:(oldstable stable testing unstable experimental)'
'(-t --type)'{-t,--type=}':type:(deb dsc udeb)'
- '(-a, --add)'{-a,--add}'[add overrides]'
- '(-S, --set)'{-S,--set}'[set overrides]'
- '(-l, --list)'{-l,--list}'[list overrides]'
- '(-q, --quiet)'{-q,--quiet}'[be less verbose]'
+ '(-a --add)'{-a,--add}'[add overrides]'
+ '(-S --set)'{-S,--set}'[set overrides]'
+ '(-l --list)'{-l,--list}'[list overrides]'
+ '(-q --quiet)'{-q,--quiet}'[be less verbose]'
)
;;
@@ -207,7 +207,7 @@ case $cmd in
(poolize)
args+=(
- '(-l --limit)'{-l,--limit=}'[only migrate amount of packages]:amount in kb:'
+ '(-l --limit)'{-l,--limit=}'[only migrate amount of packages]:amount (kb)'
'(-n --no-action)'{-n,--no-action}'[do not do anything]'
'(-v --verbose)'{-v,--verbose}'[explain what is being done]'
)
diff --git a/Completion/Debian/Command/_debsnap b/Completion/Debian/Command/_debsnap
new file mode 100644
index 000000000..b9393cac4
--- /dev/null
+++ b/Completion/Debian/Command/_debsnap
@@ -0,0 +1,77 @@
+#compdef debsnap
+
+# Based on debsnap from devscripts-2.20.3
+
+local context state state_descr line ret=1
+local -a expl
+typeset -A opt_args
+
+_arguments \
+ '(-d --destdir)'{-d+,--destdir=}'[set download directory]:download directory:_files -/' \
+ '(-f --force)'{-f,--force}'[allow non-empty destination directory]' \
+ '(-v --verbose)'{-v,--verbose}'[print configuration and report progress]' \
+ --list"[list versions; don't download]" \
+ --binary'[operate on binary packages (default: source packages)]' \
+ '*'{-a+,--architecture=}'[specify architectures to download]:architecture to download:_deb_architectures' \
+ --first='[download all versions newer than this]:version number (lower bound):->versions' \
+ --last='[download all versions older than this]:version number (upper bound):->versions' \
+ '(-)'{-h,--help}'[show usage information]' \
+ '(-)'--version'[show version number and license]' \
+ '1: :->package' \
+ '2:version number to download:->versions' \
+ && ret=0
+
+# -a implies --binary
+if (( ${+opt_args[-a]} || ${+opt_args[--architecture]} )); then
+ opt_args[--binary]=''
+fi
+
+case $state in
+ (package)
+ if (( ${+opt_args[--binary]} )); then
+ _description binary-packages expl 'binary package to download'
+ _deb_packages "${expl[@]}" avail && ret=0
+ else
+ _description source-packages expl 'source package to download'
+ _deb_packages "${expl[@]}" source && ret=0
+ fi
+ ;;
+ (versions)
+ local package=${(Q)line[1]}
+ if [[ -n $package ]]; then
+ # Compute the arguments to --list
+ local -a args
+ () {
+ local i j
+
+ # repeatable flags with arguments, where the values can't contain colons
+ for i in ${(k)opt_args[(I)(-a|--architecture)]}; do
+ for j in ${(@s.:.)opt_args[$i]}; do
+ [[ -n $j ]] || continue
+ args+=( $i $j )
+ done
+ done
+
+ # non-repeatable flags with arguments, where the values may contain colons
+ for i in ${(k)opt_args[(I)(--first|--last)]}; do
+ # Avoid spurious "No matches" results in 'debsnap --first 42.1 --last 42.<TAB>'.
+ [[ $context != option${i}-* ]] || continue
+
+ # Un-escape colons (epoch separators in the version number)
+ args+=( $i ${(Q)opt_args[$i]} )
+ done
+
+ # flags without arguments
+ args+=( ${(k)opt_args[(I)(--binary)]} )
+ }
+
+ local -a versions=( ${(Oaf)"$(_call_program versions debsnap --list ${args} -- ${line[1]})"} )
+ _description -V versions expl ${state_descr}
+ compadd "$@" "${expl[@]}" -a versions && ret=0
+ else
+ _message -- $state_descr && ret=0
+ fi
+ ;;
+esac
+
+return ret
diff --git a/Completion/Debian/Command/_dpkg b/Completion/Debian/Command/_dpkg
index 3477e6116..48ea2db97 100644
--- a/Completion/Debian/Command/_dpkg
+++ b/Completion/Debian/Command/_dpkg
@@ -86,7 +86,7 @@ _dpkg_deb_and_query_only_options=(
_dpkg_query_actions=(
'(--status -s)'{--status,-s}'[display package status]:*:packages:->status'
'(--print-avail -p)'{--print-avail,-p}'[display available details]:packages:_deb_packages avail'
- '(--listfiles, -L)'{--listfiles,-L}'[list owned files]:*:packages:->listfiles'
+ '(--listfiles -L)'{--listfiles,-L}'[list owned files]:*:packages:->listfiles'
'(--list -l)'{--list,-l}'[list packages]:*:packages:->list'
'(--search -S)'{--search,-S}'[search for file owner]:*:pattern:->search'
'--admindir=[data directory]:directory:_files -/'
diff --git a/Completion/Debian/Command/_dscverify b/Completion/Debian/Command/_dscverify
new file mode 100644
index 000000000..84b00e4e7
--- /dev/null
+++ b/Completion/Debian/Command/_dscverify
@@ -0,0 +1,26 @@
+#compdef dscverify
+
+# $ dscverify --version
+# This is dscverify, from the Debian devscripts package, version 2.20.2
+# ...
+
+local all_opts=(
+ '--help[show the help message and exit]'
+ '--version[show the version + copyright and exit]'
+ '--no-default-keyrings[do not check against the default keyrings]'
+ '*--keyring[add keyring to the list of keyrings used]:keyring:_files -g "*.(kbx|gpg)(-.)"'
+ '(--nosigcheck --no-sig-check -u)'{--nosigcheck,--no-sig-check,-u}"[don't verify the GPG signature]"
+ "--verbose[don't suppress GPG output]"
+ '*:dsc file:_files -g "*.(changes|dsc|buildinfo)(-.)"'
+)
+
+local first_only=(
+ '(--no-conf --noconf)'{--no-conf,--noconf}"[don't read the devscripts config file]"
+)
+
+if (( CURRENT == 2 )); then
+ all_opts+=( $first_only )
+fi
+
+_arguments \
+ "$all_opts[@]"
diff --git a/Completion/Debian/Command/_git-buildpackage b/Completion/Debian/Command/_git-buildpackage
index c38edc1cc..81bf7dac9 100644
--- a/Completion/Debian/Command/_git-buildpackage
+++ b/Completion/Debian/Command/_git-buildpackage
@@ -13,14 +13,14 @@ _arguments \
'--git-sign-tags[sign tags]' \
'--git-no-sign-tags[negates --git-sign-tags]' \
'--git-keyid=-[GPG keyid to sign tags with]:GPG key:' \
- '--git-debian-tag=-[format string for debian tags]:default is debian/%(version)s:' \
- '--git-upstream-tag=-[format string for upstream tags]:default is upstream/%(version)s:' \
+ '--git-debian-tag=-[format string for debian tags]:format string [debian/%%(version)s]' \
+ '--git-upstream-tag=-[format string for upstream tags]:format string [upstream/%%(version)s]' \
'--git-pristine-tar[use pristine-tar to create .orig.tar.gz]' \
'--git-no-pristine-tar[negates --git-pristine-tar]' \
'--git-force-create[force creation of orig.tar.gz]' \
'--git-no-create-orig[do not create orig.tar.gz]' \
'--git-tarball-dir=-[location to look for external tarballs]:tarball directory:_files -/' \
- '--git-compression=-[compression type]:compression:(auto gzip bzip2 lzma xz)' \
+ '--git-compression=-[compression type]:compression type [auto]:(auto gzip bzip2 lzma xz)' \
'--git-compression-level=-[set compression level]:level:(1 2 3 4 5 6 7 8 9)' \
'--git-upstream-branch=-[upstream branch]::' \
'--git-debian-branch=-[branch the Debian package is being developed on]::' \
diff --git a/Completion/Debian/Command/_lintian b/Completion/Debian/Command/_lintian
index 71e71ee3d..03491624f 100644
--- a/Completion/Debian/Command/_lintian
+++ b/Completion/Debian/Command/_lintian
@@ -8,8 +8,8 @@ case "$service" in
'(-c -r -u -C -R -S -X --check --check-part --dont-check-part --remove --remove-lab --setup-lab --unpack)'{-S,--setup-lab}'[setup or update the laboratory]' \
'(-c -r -u -C -R -S -X --check --check-part --dont-check-part --remove --remove-lab --setup-lab --unpack)'{-R,--remove-lab}'[remove the laboratory directory]' \
'(-c -r -u -C -R -S -X --check --check-part --dont-check-part --remove --remove-lab --setup-lab --unpack)'{-c,--check}'[run all checks over the specified packages]' \
- '(-c -r -u -C -R -S -X --check --check-part --dont-check-part --remove --remove-lab --setup-lab --unpack)'{-C,--check-part}'[run only the specified checks]:checks:_values -s , "lintian checks" binaries bin changelog-file chg conffiles cnf control-file dctrl control-files ctl copyright-file cpy cruft deb deb-format dfmt debconf dc debdiff dif debian-readme drm debhelper dh description des etcfiles etc fields fld files fil huge-usr-share hus infofiles info init.d ini manpages man md5sums md5 menus men menu-format mnf perl prl po-debconf pd scripts scr shared-libs shl spelling splr standards-version std' \
- '(-c -r -u -C -R -S -X --check --check-part --dont-check-part --remove --remove-lab --setup-lab --unpack)'{-X,--dont-check-part}'[run only the specified checks]:checks:_values -s , "lintian checks" binaries bin changelog-file chg conffiles cnf control-file dctrl control-files ctl copyright-file cpy cruft deb deb-format dfmt debconf dc debdiff dif debian-readme drm debhelper dh description des etcfiles etc fields fld files fil huge-usr-share hus infofiles info init.d ini manpages man md5sums md5 menus men menu-format mnf perl prl po-debconf pd scripts scr shared-libs shl spelling splr standards-version std' \
+ '(-c -r -u -C -R -S -X --check --check-part --dont-check-part --remove --remove-lab --setup-lab --unpack)'{-C,--check-part}'[run only the specified checks]: :_values -s , "lintian check" binaries bin changelog-file chg conffiles cnf control-file dctrl control-files ctl copyright-file cpy cruft deb deb-format dfmt debconf dc debdiff dif debian-readme drm debhelper dh description des etcfiles etc fields fld files fil huge-usr-share hus infofiles info init.d ini manpages man md5sums md5 menus men menu-format mnf perl prl po-debconf pd scripts scr shared-libs shl spelling splr standards-version std' \
+ '(-c -r -u -C -R -S -X --check --check-part --dont-check-part --remove --remove-lab --setup-lab --unpack)'{-X,--dont-check-part}'[run only the specified checks]: :_values -s , "lintian check" binaries bin changelog-file chg conffiles cnf control-file dctrl control-files ctl copyright-file cpy cruft deb deb-format dfmt debconf dc debdiff dif debian-readme drm debhelper dh description des etcfiles etc fields fld files fil huge-usr-share hus infofiles info init.d ini manpages man md5sums md5 menus men menu-format mnf perl prl po-debconf pd scripts scr shared-libs shl spelling splr standards-version std' \
'(-c -r -u -C -R -S -X --check --check-part --dont-check-part --remove --remove-lab --setup-lab --unpack)'{-u,--unpack}'[unpack up to unpack level]' \
'(-c -r -u -C -R -S -X --check --check-part --dont-check-part --remove --remove-lab --setup-lab --unpack)'{-r,--remove}'[clean packages up to current unpack level]' \
'(-h --help)'{-h,--help}'[help]' \
@@ -23,7 +23,7 @@ case "$service" in
'(-o --no-override)'{-o,--no-override}'[do not use the overrides file]' \
'--show-overrides[output tags that have been overridden]' \
'--color:when:(never always auto)' \
- '(-U --unpack-info)'{-U,--unpack-info}'[collect information]:info:_values -s , "collectibles" changelog-file copyright-file debfiles debian-readme diffstat doc-base-files file-info init.d md5sums menu-files objdump-info override-file scripts source-control-file' \
+ '(-U --unpack-info)'{-U,--unpack-info}'[collect information]:info:_values -s , "collectible" changelog-file copyright-file debfiles debian-readme diffstat doc-base-files file-info init.d md5sums menu-files objdump-info override-file scripts source-control-file' \
'(-m --md5sums)'{-m,--md5sums}'[check md5sums when processing a .changes file]' \
'--allow-root[override warning when run with superuser privileges]' \
'--cfg:config file:_files' \
diff --git a/Completion/Debian/Command/_madison b/Completion/Debian/Command/_madison
index 445b79a45..dfdf1b438 100644
--- a/Completion/Debian/Command/_madison
+++ b/Completion/Debian/Command/_madison
@@ -9,6 +9,6 @@ _arguments \
'(-h --help)'{-h,--help} \
'(-r --regex)'{-r,--regex} \
'(-s --suite)'{-s,--suite=}':suite:_values -s , "suite list" oldstable stable testing unstable' \
- '(-S, --source-and-binary)'{-S,--source-and-binary} \
+ '(-S --source-and-binary)'{-S,--source-and-binary} \
'*:package:_deb_packages avail'
diff --git a/Completion/Debian/Command/_module-assistant b/Completion/Debian/Command/_module-assistant
index d75284954..b2c1e56ee 100644
--- a/Completion/Debian/Command/_module-assistant
+++ b/Completion/Debian/Command/_module-assistant
@@ -33,5 +33,5 @@ _arguments -A \
'(-k --kernel-dir)'{-k,--kernel-dir}'[list of kernel headers/source directories, comma separated]:list of dirs:_files -/' \
'(-t --text-mode)'{-t,--text-mode}'[no progress bars]' \
'1:list of commands:_values -s , subcommands "${_module_assistant_commands[@]}"' \
- '*:packages: compadd /usr/src/modass/var_cache_modass/*.avail_version(N:t:r) /var/cache/modass/*.avail_version(N:t:r)'
+ '*:package: compadd /usr/src/modass/var_cache_modass/*.avail_version(N:t:r) /var/cache/modass/*.avail_version(N:t:r)'