From 992f51ea423a64091924d94ce8238c77cfdf6748 Mon Sep 17 00:00:00 2001 From: dana Date: Sun, 28 Jan 2018 06:29:58 -0600 Subject: [PATCH] Slightly improve performance of startable/restartable unit completion (#7839) --- shell-completion/zsh/_systemctl.in | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/shell-completion/zsh/_systemctl.in b/shell-completion/zsh/_systemctl.in index 47ec997..a3df9a0 100644 --- a/shell-completion/zsh/_systemctl.in +++ b/shell-completion/zsh/_systemctl.in @@ -140,20 +140,19 @@ _systemctl_get_template_names() { echo -E - ${^${(M)${(f)"$(__systemctl list-uni _systemctl_active_units() {_sys_active_units=( ${${(f)"$(__systemctl list-units "*$PREFIX*$SUFFIX*" )"}%% *} )} _systemctl_startable_units(){ - _sys_startable_units=( $( _filter_units_by_property ActiveState inactive $( - _filter_units_by_property CanStart yes $( - __systemctl $mode list-unit-files --state enabled,disabled,static "*$PREFIX*$SUFFIX*" | \ - { while read -r a b; do [[ $a =~ @\. ]] || echo -E - " $a"; done; } - __systemctl $mode list-units --state inactive,failed "*$PREFIX*$SUFFIX*" | \ - { while read -r a b; do echo -E - " $a"; done; } )) ) ) + _sys_startable_units=( $( _filter_units_by_property ActiveState inactive $( + _filter_units_by_property CanStart yes ${${${(f)"$( + __systemctl $mode list-unit-files --state enabled,disabled,static "*$PREFIX*$SUFFIX*" + __systemctl $mode list-units --state inactive,failed "*$PREFIX*$SUFFIX*" + )"}:#*@.*}%%[[:space:]]*} + )) ) } _systemctl_restartable_units(){ - _sys_restartable_units=( $(_filter_units_by_property CanStart yes $( - __systemctl $mode list-unit-files --state enabled,disabled,static "*$PREFIX*$SUFFIX*" | \ - { while read -r a b; do [[ $a =~ @\. ]] || echo -E - " $a"; done; } - __systemctl $mode list-units "*$PREFIX*$SUFFIX*" | \ - { while read -r a b; do echo -E - " $a"; done; } )) ) + _sys_restartable_units=( $( _filter_units_by_property CanStart yes ${${${(f)"$( + __systemctl $mode list-unit-files --state enabled,disabled,static "*$PREFIX*$SUFFIX*" + __systemctl $mode list-units "*$PREFIX*$SUFFIX*" + )"}:#*@.*}%%[[:space:]]*} ) ) } _systemctl_failed_units() {_sys_failed_units=( ${${(f)"$(__systemctl list-units --state=failed "*$PREFIX*$SUFFIX*" )"}%% *} ) } -- 2.7.4