summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Wallace <danielwallace@gtmanfred.com>2013-03-08 15:59:28 -0500
committerAllan McRae <allan@archlinux.org>2013-03-10 09:07:00 +1000
commit0d4ecae6252359fccf706210bececc943fb4fee3 (patch)
treeebc41c712261a95344df05a0418a3743ef98d654
parent1b78e2bb1af03e6e5245ebe1399222d0f1bfea49 (diff)
downloadpacman-0d4ecae6252359fccf706210bececc943fb4fee3.tar.xz
zsh completion: fix doubling up of specific variables
-i -y -u -d -s etc, so that they do not disappear In the future I hope there is an easy way to limit it to just 2, right now the *- makes it so that it can be added as many times as you want. Signed-off-by: Daniel Wallace <danielwallace@gtmanfred.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--contrib/zsh_completion.in48
1 files changed, 23 insertions, 25 deletions
diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in
index 3fec4eca..86fe788d 100644
--- a/contrib/zsh_completion.in
+++ b/contrib/zsh_completion.in
@@ -56,9 +56,8 @@ _pacman_opts_query_modifiers=(
'-c[List package changelog]'
'-d[List packages installed as dependencies]'
'-e[List packages explicitly installed]'
- '-i[View package information]'
- '-ii[View package information including backup files]'
- '-k[Check package files]'
+ '*-i[View package information]'
+ '*-k[Check package files]'
'-l[List package contents]'
'-m[List installed packages not found in sync db(s)]'
'-n[List installed packages found in sync db(s)]'
@@ -69,9 +68,9 @@ _pacman_opts_query_modifiers=(
# options for passing to _arguments: options for --remove command
_pacman_opts_remove=(
'-c[Remove all dependent packages]'
- '-d[Skip dependency checks]'
+ '*-d[Skip dependency checks]'
'-n[Remove protected configuration files]'
- '-s[Remove dependencies not required by other packages]'
+ '*-s[Remove dependencies not required by other packages]'
'--dbonly[Only remove database entry, do not remove files]'
'*:installed package:_pacman_completions_installed_packages'
)
@@ -86,7 +85,6 @@ _pacman_opts_database=(
_pacman_opts_sync_actions=(
'-S'
'*-c[Remove old packages from cache]:*:clean:->sync_clean'
- '*-cc[Remove all packages from cache]:*:clean:->sync_clean'
'-g[View all members of a package group]:*:package groups:->sync_group'
'-s[Search package names and descriptions]:*:search text:->sync_search'
'--dbonly[Only remove database entry, do not remove files]'
@@ -96,13 +94,13 @@ _pacman_opts_sync_actions=(
# options for passing to _arguments: options for --sync command
_pacman_opts_sync_modifiers=(
- '-d[Skip dependency checks]'
- '-i[View package information]'
+ '*-d[Skip dependency checks]'
+ '*-i[View package information]'
'-l[List all packages in a repository]'
'-p[Print download URIs for each package to be installed]'
- '-u[Upgrade all out-of-date packages]'
+ '*-u[Upgrade all out-of-date packages]'
'-w[Download packages only]'
- '-y[Download fresh package databases]'
+ '*-y[Download fresh package databases]'
'*--ignore[Ignore a package upgrade]:package:
_pacman_completions_all_packages'
'*--ignoregroup[Ignore a group upgrade]:package group:
@@ -490,22 +488,22 @@ _keys() {
}
_makepkg_shortopts=(
- '*-s[Install missing dependencies with pacman]'
- '*-i[Install package after successful build]'
- '*-A[Ignore incomplete arch field in PKGBUILD]'
- '*-c[Clean up work files after build]'
- '*-d[Skip all dependency checks]'
- '*-e[Do not extract source files (use existing src/ dir)]'
- '*-f[Overwrite existing package]'
- '*-g[Generate integrity checks for source files]'
- '*-h[Show help message and exit]'
- '*-L[Log package build process]'
- '*-m[Disable colorized output messages]'
- '*-o[Download and extract files only]'
+ '-s[Install missing dependencies with pacman]'
+ '-i[Install package after successful build]'
+ '-A[Ignore incomplete arch field in PKGBUILD]'
+ '-c[Clean up work files after build]'
+ '-d[Skip all dependency checks]'
+ '-e[Do not extract source files (use existing src/ dir)]'
+ '-f[Overwrite existing package]'
+ '-g[Generate integrity checks for source files]'
+ '-h[Show help message and exit]'
+ '-L[Log package build process]'
+ '-m[Disable colorized output messages]'
+ '-o[Download and extract files only]'
'-p[Use an alternate build script (instead of 'PKGBUILD')]: :_files'
- '*-r[Remove installed dependencies after a successful build]'
- '*-R[Repackage contents of the package without rebuilding]'
- '*-S[Generate a source-only tarball without downloading sources]'
+ '-r[Remove installed dependencies after a successful build]'
+ '-R[Repackage contents of the package without rebuilding]'
+ '-S[Generate a source-only tarball without downloading sources]'
)
_makepkg_action_none(){