1
0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-08 20:38:04 -05:00

zsh completion: use consistent case statement style

Signed-off-by: Daniel Wallace <danielwallace@gtmanfred.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Daniel Wallace 2013-03-06 16:04:00 -05:00 committed by Allan McRae
parent 8db7e0c98d
commit 704ab17a6a

View File

@ -341,8 +341,18 @@ _pacman_zsh_comp() {
"$_pacman_opts_query_modifiers[@]" \ "$_pacman_opts_query_modifiers[@]" \
'*:package file:_files -g "*.pkg.tar*"' '*:package file:_files -g "*.pkg.tar*"'
;; ;;
Q*) _pacman_action_query ;; T*)
R*) _pacman_action_remove ;; _arguments -s : \
'-T' \
"$_pacman_opts_common[@]" \
":packages:_pacman_all_packages"
;;
Q*)
_pacman_action_query
;;
R*)
_pacman_action_remove
;;
S*c*) # no completion S*c*) # no completion
return 0 return 0
;; ;;
@ -358,16 +368,24 @@ _pacman_zsh_comp() {
"$_pacman_opts_sync_modifiers[@]" \ "$_pacman_opts_sync_modifiers[@]" \
'*:package group:_pacman_completions_all_groups' '*:package group:_pacman_completions_all_groups'
;; ;;
S*) _pacman_action_sync ;; S*)
_pacman_action_sync
;;
T*) T*)
_arguments -s : \ _arguments -s : \
'-T' \ '-T' \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
":packages:_pacman_all_packages" ":packages:_pacman_all_packages"
;; ;;
U*) _pacman_action_upgrade ;; U*)
V*) _pacman_action_version ;; _pacman_action_upgrade
* ) _pacman_action_none ;; ;;
V*)
_pacman_action_version
;;
*)
_pacman_action_none
;;
esac esac
} }
@ -382,7 +400,7 @@ _key_shortopts=(
'-u[Update the trustdb of pacman]' '-u[Update the trustdb of pacman]'
'-v[Verify the file specified by the signature]: :_files -g "*.sig"' '-v[Verify the file specified by the signature]: :_files -g "*.sig"'
'-V[Show program version]' '-V[Show program version]'
) )
_key_longopts=( _key_longopts=(
'--help[show help]' '--help[show help]'
@ -403,13 +421,13 @@ _key_longopts=(
'--lsign-key[Locally sign the specified keyid]:*: :_keys' '--lsign-key[Locally sign the specified keyid]:*: :_keys'
'--populate[Reload the default keys from the (given) keyrings in '/usr/share/pacman/keyrings']: :_path_files -W /usr/share/pacman/keyrings' '--populate[Reload the default keys from the (given) keyrings in '/usr/share/pacman/keyrings']: :_path_files -W /usr/share/pacman/keyrings'
'--refresh-keys[Update specified or all keys from a keyserver]:*: :_keys' '--refresh-keys[Update specified or all keys from a keyserver]:*: :_keys'
) )
_pacman_key_options=( _pacman_key_options=(
'--config[Use an alternate config file (instead of /etc/pacman.con)]: :_files' '--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 -/' '--gpgdir[Set an alternate directory for GnuPG (instead of /etc/pacman.d/gnupg)]: :_files -/'
'--keyserver[Specify a keyserver to use if necessary]' '--keyserver[Specify a keyserver to use if necessary]'
) )
_pacman_key() { _pacman_key() {
case $words[CURRENT] in case $words[CURRENT] in
@ -441,7 +459,9 @@ _pacman_key() {
"$_key_shortopts[@]" \ "$_key_shortopts[@]" \
"$_key_longopts[@]" "$_key_longopts[@]"
;; ;;
*) return 1;; *)
return 1
;;
esac esac
;; ;;
esac esac
@ -485,7 +505,7 @@ _makepkg_shortopts=(
'*-r[Remove installed dependencies after a successful build]' '*-r[Remove installed dependencies after a successful build]'
'*-R[Repackage contents of the package without rebuilding]' '*-R[Repackage contents of the package without rebuilding]'
'*-S[Generate a source-only tarball without downloading sources]' '*-S[Generate a source-only tarball without downloading sources]'
) )
_makepkg_action_none(){ _makepkg_action_none(){
_arguments \ _arguments \
@ -524,7 +544,7 @@ _makepkg_longopts=(
'--noconfirm[do not ask for confirmation when resolving dependencies]' '--noconfirm[do not ask for confirmation when resolving dependencies]'
'--asdeps[Install packages as non-explicitly installed]' '--asdeps[Install packages as non-explicitly installed]'
'--noprogressbar[Do not show a progress bar when downloading files]' '--noprogressbar[Do not show a progress bar when downloading files]'
) )
_makepkg(){ _makepkg(){
case $words[CURRENT] in case $words[CURRENT] in
-*) -*)
@ -536,8 +556,10 @@ _makepkg(){
_arguments -s \ _arguments -s \
"$_makepkg_longopts[@]" "$_makepkg_longopts[@]"
;; ;;
- )_makepkg_action_none ;; - )
* ) _makepkg_action_none
;;
*)
i=$# i=$#
while [[ $words[i] != -* ]] && [[ $words[$i] != "makepkg" ]];do while [[ $words[i] != -* ]] && [[ $words[$i] != "makepkg" ]];do
i=$((i-1)); i=$((i-1));
@ -552,8 +574,12 @@ _makepkg(){
_arguments -s \ _arguments -s \
"$_makepkg_longopts[@]" "$_makepkg_longopts[@]"
;; ;;
- )_makepkg_action_none ;; - )
* ) return 1 ;; _makepkg_action_none
;;
* )
return 1
;;
esac esac
;; ;;
esac esac
@ -561,13 +587,17 @@ _makepkg(){
_pacman_comp() { _pacman_comp() {
case "$service" in case "$service" in
makepkg) makepkg)
_makepkg "$@";; _makepkg "$@"
;;
pacman-key) pacman-key)
_pacman_key "$@";; _pacman_key "$@"
;;
pacman) pacman)
_pacman_zsh_comp "$@";; _pacman_zsh_comp "$@"
;;
*) *)
_message "Error";; _message "Error"
;;
esac esac
} }