chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cryptsetup-generator: Split main() into more functions and use hasmaps
[elogind.git]
/
shell-completion
/
zsh
/
_localectl
diff --git
a/shell-completion/zsh/_localectl
b/shell-completion/zsh/_localectl
index 321e418b5089841ee37fcd5db642b67417faac32..d8af4d186374a100c7384e361bdf62c6f31cf381 100644
(file)
--- a/
shell-completion/zsh/_localectl
+++ b/
shell-completion/zsh/_localectl
@@
-1,24
+1,29
@@
#compdef localectl
_localectl_set-locale() {
#compdef localectl
_localectl_set-locale() {
- local -a _confs _locales
+ local -a _locales locale_fields
+ locale_fields=(LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME \
+ LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER \
+ LC_NAME LC_ADDRESS LC_TELEPHONE \
+ LC_MEASUREMENT LC_IDENTIFICATION)
+ # LC_ALL is omitted on purpose
+
local expl suf
_locales=( ${(f)"$(_call_program locales "$service" list-locales)"} )
local expl suf
_locales=( ${(f)"$(_call_program locales "$service" list-locales)"} )
- _confs=( ${${(f)"$(_call_program confs "locale 2>/dev/null")"}%\=*} )
+ compset -P1 '*='
if [[ -prefix 1 *\= ]]; then
local conf=${PREFIX%%\=*}
if [[ -prefix 1 *\= ]]; then
local conf=${PREFIX%%\=*}
- compset -P1 '*='
_wanted locales expl "locales configs" \
_combination localeconfs confs=$conf locales "$@" -
else
_wanted locales expl "locales configs" \
_combination localeconfs confs=$conf locales "$@" -
else
- compadd -S '='
$_conf
s
+ compadd -S '='
$locale_field
s
fi
}
_localectl_set-keymap() {
local -a _keymaps
fi
}
_localectl_set-keymap() {
local -a _keymaps
- _keymaps=( ${(f)"$(_call_program locales "$service" list-keymaps)"} )
if (( CURRENT <= 3 )); then
if (( CURRENT <= 3 )); then
+ _keymaps=( ${(f)"$(_call_program locales "$service" list-keymaps)"} )
_describe keymaps _keymaps
else
_message "no more options"
_describe keymaps _keymaps
else
_message "no more options"
@@
-59,6
+64,10
@@
_localectl_command() {
'set-keymap:Set virtual console keyboard mapping'
'list-keymaps:Show known virtual console keyboard mappings'
'set-x11-keymap:Set X11 keyboard mapping'
'set-keymap:Set virtual console keyboard mapping'
'list-keymaps:Show known virtual console keyboard mappings'
'set-x11-keymap:Set X11 keyboard mapping'
+ 'list-x11-keymap-models:Show known X11 keyboard mapping models'
+ 'list-x11-keymap-layouts:Show known X11 keyboard mapping layouts'
+ 'list-x11-keymap-variants:Show known X11 keyboard mapping variants'
+ 'list-x11-keymap-options:Show known X11 keyboard mapping options'
)
if (( CURRENT == 1 )); then
_describe -t commands 'localectl command' _localectl_cmds
)
if (( CURRENT == 1 )); then
_describe -t commands 'localectl command' _localectl_cmds
@@
-68,7
+77,7
@@
_localectl_command() {
if (( $+functions[_localectl_$cmd] )); then
_localectl_$cmd
else
if (( $+functions[_localectl_$cmd] )); then
_localectl_$cmd
else
- _message "
no more options
"
+ _message "
unknown localectl command: $words[1]
"
fi
fi
}
fi
fi
}
@@
-79,5
+88,6
@@
_arguments \
"--no-convert[Don't convert keyboard mappings]" \
'--no-pager[Do not pipe output into a pager]' \
'--no-ask-password[Do not prompt for password]' \
"--no-convert[Don't convert keyboard mappings]" \
'--no-pager[Do not pipe output into a pager]' \
'--no-ask-password[Do not prompt for password]' \
- {-H,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
+ {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
+ {-M+,--machine=}'[Operate on local container]:machine' \
'*::localectl commands:_localectl_command'
'*::localectl commands:_localectl_command'