[systemd-devel] [PATCH 06/16] shell-comp: Split out zsh _localectl
William Giokas
1007380 at gmail.com
Tue Jul 30 21:22:44 PDT 2013
---
Makefile.am | 3 ++
shell-completion/zsh/_localectl | 89 +++++++++++++++++++++++++++++++++++++++++
shell-completion/zsh/_systemd | 86 +--------------------------------------
3 files changed, 93 insertions(+), 85 deletions(-)
create mode 100644 shell-completion/zsh/_localectl
diff --git a/Makefile.am b/Makefile.am
index e331e67..64d4785 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3443,6 +3443,9 @@ bin_PROGRAMS += \
dist_bashcompletion_DATA += \
shell-completion/bash/localectl
+dist_zshcompletion_DATA += \
+ shell-completion/zsh/_localectl
+
endif
polkitpolicy_in_files += \
diff --git a/shell-completion/zsh/_localectl b/shell-completion/zsh/_localectl
new file mode 100644
index 0000000..0beed4f
--- /dev/null
+++ b/shell-completion/zsh/_localectl
@@ -0,0 +1,89 @@
+#compdef localectl
+
+_localectl_set-locale() {
+ local -a _confs _locales
+ local expl suf
+ _locales=( ${(f)"$(_call_program locales "$service" list-locales)"} )
+ _confs=( ${${(f)"$(_call_program confs "locale 2>/dev/null")"}%\=*} )
+ if [[ -prefix 1 *\= ]]; then
+ local conf=${PREFIX%%\=*}
+ compset -P1 '*='
+ _wanted locales expl "locales configs" \
+ _combination localeconfs confs=$conf locales "$@" -
+ else
+ compadd -S '=' $_confs
+ fi
+}
+
+_localectl_set-keymap() {
+ local -a _keymaps
+ _keymaps=( ${(f)"$(_call_program locales "$service" list-keymaps)"} )
+ if (( CURRENT <= 3 )); then
+ _describe keymaps _keymaps
+ else
+ _message "no more options"
+ fi
+}
+
+_localectl_set-x11-keymap() {
+ if (( $+commands[pkg-config] )); then
+ local -a _file _layout _model _variant _options
+ local _xorg_lst
+ _xorg_lst=${"$($commands[pkg-config] xkeyboard-config --variable=xkb_base)"}
+ _file=( ${(ps:\n\!:)"$(<$_xorg_lst/rules/xorg.lst)"} )
+ _layout=( ${${${(M)${(f)_file[1]}:# *}# }%% *} )
+ _model=( ${${${(M)${(f)_file[2]}:# *}# }%% *} )
+ _variant=( ${${${(M)${(f)_file[3]}:# *}# }%% *} )
+ _options=( ${${${(M)${(f)_file[4]}:# *}# }%% *} )
+ #_layout=( ${(f)"$( echo $_file[1] | awk '/^ / {print $1}' )"} )
+ #_model=( ${(f)"$(echo $_file[2] | awk '/^ / {print $1}')"} )
+ #_variant=( ${(f)"$(echo $_file[3] | awk '/^ / {print $1}')"} )
+ #_options=( ${(f)"$(echo ${_file[4]//:/\\:} | awk '/^ / {print $1}')"} )
+
+ case $CURRENT in
+ 2) _describe layouts _layout ;;
+ 3) _describe models _model;;
+ 4) _describe variants _variant;;
+ 5) _describe options _options;;
+ *) _message "no more options"
+ esac
+ fi
+}
+
+_localectl_command() {
+ local -a _localectl_cmds
+ _localectl_cmds=(
+ 'status:Show current locale settings'
+ 'set-locale:Set system locale'
+ 'list-locales:Show known locales'
+ 'set-keymap:Set virtual console keyboard mapping'
+ 'list-keymaps:Show known virtual console keyboard mappings'
+ 'set-x11-keymap:Set X11 keyboard mapping'
+ )
+ if (( CURRENT == 1 )); then
+ _describe -t commands 'localectl command' _localectl_cmds
+ else
+ local curcontext="$curcontext"
+ cmd="${${_localectl_cmds[(r)$words[1]:*]%%:*}}"
+ if (( $+functions[_localectl_$cmd] )); then
+ _localectl_$cmd
+ else
+ _message "no more options"
+ fi
+ fi
+}
+
+_hosts_or_user_at_host() {
+ _alternative \
+ 'users-hosts:: _user_at_host' \
+ 'hosts:: _hosts'
+}
+
+_arguments \
+ {-h,--help}'[Show this help]' \
+ '--version[Show package version]' \
+ "--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:_hosts_or_user_at_host' \
+ '*::localectl commands:_localectl_command'
diff --git a/shell-completion/zsh/_systemd b/shell-completion/zsh/_systemd
index 488d460..70746ef 100644
--- a/shell-completion/zsh/_systemd
+++ b/shell-completion/zsh/_systemd
@@ -1,19 +1,9 @@
-#compdef localectl timedatectl systemd-coredumpctl udevadm systemd-analyze systemd-cat systemd-ask-password systemd-cgls systemd-cgtop systemd-delta systemd-detect-virt systemd-inhibit systemd-machine-id-setup systemd-notify systemd-nspawn systemd-tmpfiles systemd-tty-ask-password-agent machinectl
+#compdef timedatectl systemd-coredumpctl udevadm systemd-analyze systemd-cat systemd-ask-password systemd-cgls systemd-cgtop systemd-delta systemd-detect-virt systemd-inhibit systemd-machine-id-setup systemd-notify systemd-nspawn systemd-tmpfiles systemd-tty-ask-password-agent machinectl
_ctls()
{
local curcontext="$curcontext" state lstate line
case "$service" in
- localectl)
- _arguments \
- {-h,--help}'[Show this help]' \
- '--version[Show package version]' \
- "--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:_hosts_or_user_at_host' \
- '*::localectl commands:_localectl_command'
- ;;
systemd-coredumpctl)
_arguments \
{-o,--output=}'[Write output to FILE]:output file:_files' \
@@ -244,80 +234,6 @@ _outputmodes() {
_describe -t output 'output mode' _output_opts || compadd "$@"
}
-_localectl_set-locale() {
- local -a _confs _locales
- local expl suf
- _locales=( ${(f)"$(_call_program locales "$service" list-locales)"} )
- _confs=( ${${(f)"$(_call_program confs "locale 2>/dev/null")"}%\=*} )
- if [[ -prefix 1 *\= ]]; then
- local conf=${PREFIX%%\=*}
- compset -P1 '*='
- _wanted locales expl "locales configs" \
- _combination localeconfs confs=$conf locales "$@" -
- else
- compadd -S '=' $_confs
- fi
-}
-
-_localectl_set-keymap() {
- local -a _keymaps
- _keymaps=( ${(f)"$(_call_program locales "$service" list-keymaps)"} )
- if (( CURRENT <= 3 )); then
- _describe keymaps _keymaps
- else
- _message "no more options"
- fi
-}
-
-_localectl_set-x11-keymap() {
- if (( $+commands[pkg-config] )); then
- local -a _file _layout _model _variant _options
- local _xorg_lst
- _xorg_lst=${"$($commands[pkg-config] xkeyboard-config --variable=xkb_base)"}
- _file=( ${(ps:\n\!:)"$(<$_xorg_lst/rules/xorg.lst)"} )
- _layout=( ${${${(M)${(f)_file[1]}:# *}# }%% *} )
- _model=( ${${${(M)${(f)_file[2]}:# *}# }%% *} )
- _variant=( ${${${(M)${(f)_file[3]}:# *}# }%% *} )
- _options=( ${${${(M)${(f)_file[4]}:# *}# }%% *} )
- #_layout=( ${(f)"$( echo $_file[1] | awk '/^ / {print $1}' )"} )
- #_model=( ${(f)"$(echo $_file[2] | awk '/^ / {print $1}')"} )
- #_variant=( ${(f)"$(echo $_file[3] | awk '/^ / {print $1}')"} )
- #_options=( ${(f)"$(echo ${_file[4]//:/\\:} | awk '/^ / {print $1}')"} )
-
- case $CURRENT in
- 2) _describe layouts _layout ;;
- 3) _describe models _model;;
- 4) _describe variants _variant;;
- 5) _describe options _options;;
- *) _message "no more options"
- esac
- fi
-}
-
-
-_localectl_command() {
- local -a _localectl_cmds
- _localectl_cmds=(
- 'status:Show current locale settings'
- 'set-locale:Set system locale'
- 'list-locales:Show known locales'
- 'set-keymap:Set virtual console keyboard mapping'
- 'list-keymaps:Show known virtual console keyboard mappings'
- 'set-x11-keymap:Set X11 keyboard mapping'
- )
- if (( CURRENT == 1 )); then
- _describe -t commands 'localectl command' _localectl_cmds
- else
- local curcontext="$curcontext"
- cmd="${${_localectl_cmds[(r)$words[1]:*]%%:*}}"
- if (( $+functions[_localectl_$cmd] )); then
- _localectl_$cmd
- else
- _message "no more options"
- fi
- fi
-}
-
_timedatectl_set-timezone(){
local -a _timezones
_timezones=( ${(f)"$(_call_program timezones "${service}" list-timezones)"} )
--
1.8.4.rc0.352.g531e8cb
More information about the systemd-devel
mailing list