-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> --- contrib/zsh_completion.in | 57 +++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index cae12ae..16aee7b 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' ) @@ -85,8 +84,8 @@ _pacman_opts_database=( # options for passing to _arguments: options for --sync command _pacman_opts_sync_actions=( '-S' - '*-c[Remove old packages from cache]:*:clean:->sync_clean' - '*-cc[Remove all packages from cache]:*:clean:->sync_clean' + '-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 +95,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: @@ -419,9 +418,9 @@ _key_longopts=( ) _pacman_key_options=( - '--config[Use an alternate config file (instead of /etc/pacman.con)]: :_files' - '--gpgdir[Set an alternate directory for GnuPG (instead of /etc/pacman.d/gnupg)]: :_files -/' - '--keyserver[Specify a keyserver to use if necessary]' + '--config[Use an alternate config file (instead of /etc/pacman.con)]: :_files' + '--gpgdir[Set an alternate directory for GnuPG (instead of /etc/pacman.d/gnupg)]: :_files -/' + '--keyserver[Specify a keyserver to use if necessary]' ) _pacman_key() { @@ -484,22 +483,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(){ -- 1.8.1.5

add all the longopts for the operations and allow for them to be completed just like shortopts Signed-off-by: Daniel Wallace <danielwallace@gtmanfred.com> --- contrib/zsh_completion.in | 79 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 64 insertions(+), 15 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index aadf2c5..fa63203 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -13,7 +13,7 @@ _pacman_opts_commands=( {-T,--deptest}'[Check if dependencies are installed]' {-U,--upgrade}'[Upgrade a package]' {-V,--version}'[Display version and exit]' - {-h,--help}'[Display usage]' + '(-h --help)'{-h,--help}'[Display usage]' ) # options for passing to _arguments: options common to all commands @@ -44,7 +44,7 @@ _pacman_opts_pkgfile=( # options for passing to _arguments: subactions for --query command _pacman_opts_query_actions=( - '-Q' + '(-Q --query)'{-Q,--query} {-g,--groups}'[View all members of a package group]:*:package groups:->query_group' {-o,--owns}'[Query the package that owns a file]:file:_files' {-p,--file}'[Package file to query]:*:package file:->query_file' @@ -83,7 +83,7 @@ _pacman_opts_database=( # options for passing to _arguments: options for --sync command _pacman_opts_sync_actions=( - '-S' + '(-S --sync)'{-S,--sync} {\*-c,\*--clean}'[Remove old packages from cache]:\*:clean:->sync_clean' {-g,--groups}'[View all members of a package group]:*:package groups:->sync_group' {-s,--search}'[Search package names and descriptions]:*:search text:->sync_search' @@ -118,6 +118,7 @@ _pacman_action_help() { _pacman_action_none() { _arguments -s : \ "$_pacman_opts_commands[@]" + return 0 } # handles --query subcommand @@ -163,7 +164,7 @@ _pacman_action_query() { # handles --remove subcommand _pacman_action_remove() { _arguments -s : \ - '-R' \ + '(--remove -R)'{-R,--remove} \ "$_pacman_opts_common[@]" \ "$_pacman_opts_remove[@]" } @@ -171,29 +172,43 @@ _pacman_action_remove() { # handles --database subcommand _pacman_action_database() { _arguments -s : \ - '-D' \ + '(--database -D)'{-D,--database} \ "$_pacman_opts_common[@]" \ "$_pacman_opts_database[@]" } +_pacman_action_deptest () { + _arguments -s : \ + '(--deptest)-T' \ + "$_pacman_opts_common[@]" \ + ":packages:_pacman_all_packages" +} # handles --sync subcommand _pacman_action_sync() { local context state line typeset -A opt_args + if (( $+words[(r)--clean] )); then + state=sync_clean + elif (( $+words[(r)--groups] )); then + state=sync_group + elif (( $+words[(r)--search] )); then + state=sync_search + fi case $state in sync_clean) _arguments -s : \ + {\*-c,\*--clean}'[Remove old packages from cache]' \ "$_pacman_opts_common[@]" \ "$_pacman_opts_sync_modifiers[@]" \ - '*-c[Remove old packages from cache]' \ ;; sync_group) _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_sync_modifiers[@]" \ + '(-g --group)'{-g,--groups} \ '*:package group:_pacman_completions_all_groups' ;; sync_search) @@ -215,7 +230,7 @@ _pacman_action_sync() { # handles --upgrade subcommand _pacman_action_upgrade() { _arguments -s : \ - '-U' \ + '(-U --upgrade)'{-U,--upgrade} \ "$_pacman_opts_common[@]" \ "$_pacman_opts_pkgfile[@]" } @@ -304,11 +319,14 @@ _pacman_get_command() { # main dispatcher _pacman_zsh_comp() { - local -a args; + local -a args cmds; args=( ${${${(M)words:#-*}#-}:#-*} ) + for tmp in $words; do + cmds+=("${${_pacman_opts_commands[(r)*$tmp\[*]%%\[*}#*\)}") + done case $args in #$words[2] in h*) - if (( ${(c)#args} <= 1 )); then + if (( ${(c)#args} <= 1 && ${(w)#cmds} <= 1 )); then _pacman_action_help else _message "no more arguments" @@ -336,10 +354,7 @@ _pacman_zsh_comp() { '*:package file:_files -g "*.pkg.tar*"' ;; T*) - _arguments -s : \ - '-T' \ - "$_pacman_opts_common[@]" \ - ":packages:_pacman_all_packages" + _pacman_action_deptest ;; Q*) _pacman_action_query @@ -352,7 +367,7 @@ _pacman_zsh_comp() { ;; S*c*) # no completion _arguments -s \ - '-c' \ + '(-c --clean)'{\*-c,\*--clean} \ "$_pacman_opts_common[@]" ;; S*l*) # repos @@ -377,9 +392,43 @@ _pacman_zsh_comp() { _pacman_action_version ;; *) - _pacman_action_none + + case ${(M)words:#--*} in + *--help*) + if (( ${(w)#cmds} == 1 )); then + _pacman_action_help + else + return 0; + fi + ;; + *--sync*) + _pacman_action_sync + ;; + *--query*) + _pacman_action_query + ;; + *--remove*) + _pacman_action_remove + ;; + *--deptest*) + _pacman_action_deptest + ;; + *--database*) + _pacman_action_database + ;; + *--version*) + _pacman_action_version + ;; + *--upgrade*) + _pacman_action_upgrade + ;; + *) + _pacman_action_none + ;; + esac ;; esac + return 0 } _key_shortopts=( -- 1.8.1.5