diff options
| author | Dan McGee <dan@archlinux.org> | 2008-01-13 12:27:17 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-01-13 12:27:17 -0600 |
| commit | 521de7ceedc6e4f5df52c0380f536a6f13a7f578 (patch) | |
| tree | 1b6d86158a19b3156c23cb81ee90f291ca85f9b3 /contrib/zsh_completion | |
| parent | 4f267017936471c8248a85f8d86aabb96e66c7e8 (diff) | |
| parent | bbe02ec57fd56670dfe0bc08d981ce8a1aa31370 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'contrib/zsh_completion')
| -rw-r--r-- | contrib/zsh_completion | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/contrib/zsh_completion b/contrib/zsh_completion index 5ea6c33b..8dec06df 100644 --- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -49,7 +49,6 @@ _pacman_opts_query_modifiers=( '-c[List package changelog]' '-d[List packages installed as dependencies]' '-e[List packages explicitly installed]' - '-g[List all members of a package group]' '-i[View package information]' '-ii[View package information including backup files]' '-l[List package contents]' @@ -87,8 +86,10 @@ _pacman_opts_sync_modifiers=( '-u[Upgrade all out-of-date packages]' '-w[Download packages only]' '-y[Download fresh package databases]' - '*--ignore[Ignore a package upgrade]:package:_pacman_completions_installed_packages' - '*--ignoregroup[Ignore a group upgrade]:package group:_pacman_completions_all_groups' + '*--ignore[Ignore a package upgrade]:package: + _pacman_completions_all_packages' + '*--ignoregroup[Ignore a group upgrade]:package group: + _pacman_completions_all_groups' '--asdeps[Install packages as non-explicitly installed]' ) @@ -288,17 +289,6 @@ _pacman_get_command() { # main dispatcher _pacman() { - # First check if --ignoregroup was the last command given. If so, complete - # all groups. - if [ "$words[-2]" = "--ignoregroup" ]; then - _arguments -s : \ - "$_pacman_opts_common[@]" \ - "$_pacman_opts_sync_modifiers[@]" \ - '*:package group:_pacman_completions_all_groups' - return 0 - fi - - # Otherwise, complete on the given command. case $words[2] in -A*) _pacman_action_add ;; -Q*g*) # ipkg groups @@ -307,7 +297,7 @@ _pacman() { "$_pacman_opts_query_modifiers[@]" \ '*:groups:_pacman_completions_installed_groups' ;; - -Q*o*) # file *.pkg.tar.gz + -Q*o*) # file _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_query_modifiers[@]" \ |