diff options
| author | Eric Cook <llua@gmx.com> | 2015-05-18 07:02:39 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-05-18 11:22:08 +0200 |
| commit | fb869ca1d20e503708ae813c3d3ebcf5a5173c25 (patch) | |
| tree | 7b0adc59e26a3053154afea529349c7215d5ef97 /shell-completion | |
| parent | zsh-completion: actually run _filter_units_by_property when creating the arra... (diff) | |
| download | systemd-fb869ca1d20e503708ae813c3d3ebcf5a5173c25.tar.xz systemd-fb869ca1d20e503708ae813c3d3ebcf5a5173c25.zip | |
zsh-completion: actually complete template names for subcommands enable, reenable and disable.
compadd's -a option treats non-option arguments as arrays. So
$(_systemctl_get_template_names) expands to some words that aren't
legal array names. Even if there were, they would be empty; thus adding
nothing.
deduplicated a few functions too.
Diffstat (limited to 'shell-completion')
| -rw-r--r-- | shell-completion/zsh/_systemctl.in | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/shell-completion/zsh/_systemctl.in b/shell-completion/zsh/_systemctl.in index 678e81ed7f..fc9fc2ea00 100644 --- a/shell-completion/zsh/_systemctl.in +++ b/shell-completion/zsh/_systemctl.in @@ -166,9 +166,7 @@ _systemctl_restartable_units(){ } _systemctl_failed_units() {_sys_failed_units=( $(__systemctl list-units --failed | { while read -r a b; do echo -E - " $a"; done; }) )} -_systemctl_enabled_units() {_sys_enabled_units=( $(__systemctl list-unit-files | { while read -r a b; do [[ $b == "enabled" ]] && echo -E - " $a"; done; }) )} -_systemctl_disabled_units(){_sys_disabled_units=($(__systemctl list-unit-files | { while read -r a b; do [[ $b == "disabled" ]] && echo -E - " $a"; done; }) )} -_systemctl_masked_units() {_sys_masked_units=( $(__systemctl list-unit-files | { while read -r a b; do [[ $b == "masked" ]] && echo -E - " $a"; done; }) )} +_systemctl_unit_state() { typeset -gA _sys_unit_state; _sys_unit_state=( $(__systemctl list-unit-files) ) } local fun # Completion functions for ALL_UNITS @@ -183,22 +181,21 @@ done # Completion functions for ENABLED_UNITS (( $+functions[_systemctl_disable] )) || _systemctl_disable() { - _systemctl_enabled_units - compadd "$@" -a - _sys_enabled_units + local _sys_unit_state; _systemctl_unit_state + compadd "$@" - ${(k)_sys_unit_state[(R)enabled]} } (( $+functions[_systemctl_reenable] )) || _systemctl_reenable() { - _systemctl_enabled_units - _systemctl_disabled_units - compadd "$@" -a - _sys_enabled_units _sys_disabled_units $(_systemctl_get_template_names) + local _sys_unit_state; _systemctl_unit_state + compadd "$@" - ${(k)_sys_unit_state[(R)(enabled|disabled)]} $(_systemctl_get_template_names) } # Completion functions for DISABLED_UNITS (( $+functions[_systemctl_enable] )) || _systemctl_enable() { - _systemctl_disabled_units - compadd "$@" -a - _sys_disabled_units $(_systemctl_get_template_names) + local _sys_unit_state; _systemctl_unit_state + compadd "$@" - ${(k)_sys_unit_state[(R)disabled]} $(_systemctl_get_template_names) } # Completion functions for FAILED_UNITS @@ -255,8 +252,8 @@ done # Completion functions for MASKED_UNITS (( $+functions[_systemctl_unmask] )) || _systemctl_unmask() { - _systemctl_masked_units - compadd "$@" -a - _sys_masked_units || _message "no masked units found" + local _sys_unit_state; _systemctl_unit_state + compadd "$@" - ${(k)_sys_unit_state[(R)masked]} || _message "no masked units found" } # Completion functions for JOBS |