chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shell-completion: fix completion of localectl set-locale
[elogind.git]
/
shell-completion
/
zsh
/
_localectl
diff --git
a/shell-completion/zsh/_localectl
b/shell-completion/zsh/_localectl
index 3d76bb0c4d5c5e32ad84722d37387211455662d8..c04f4f3109c7f66d386c6d7d429fd658c9d54dd3 100644
(file)
--- a/
shell-completion/zsh/_localectl
+++ b/
shell-completion/zsh/_localectl
@@
-1,17
+1,22
@@
#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
}
fi
}