diff options
Diffstat (limited to 'shell-completion')
| -rw-r--r-- | shell-completion/bash/systemctl.in | 17 | ||||
| -rw-r--r-- | shell-completion/zsh/_systemctl.in | 16 |
2 files changed, 18 insertions, 15 deletions
diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in index 015001815f..bca02310a9 100644 --- a/shell-completion/bash/systemctl.in +++ b/shell-completion/bash/systemctl.in @@ -55,10 +55,14 @@ __get_all_units () { { __systemctl $1 list-unit-files; __systemctl $1 list- | { while read -r a b; do echo " $a"; done; }; } __get_active_units () { __systemctl $1 list-units \ | { while read -r a b; do echo " $a"; done; }; } -__get_startable_units () { { - __systemctl $1 list-units --all -t service,timer,socket,mount,automount,path,snapshot,swap - __systemctl $1 list-unit-files -t service,timer,socket,mount,automount,path,snapshot,swap; } \ - | { while read -r a b c d; do [[ $c == "inactive" || $c == "failed" ]] && echo " $a"; done; }; } +__get_startable_units () { + # find inactive or failed units, filter out masked and not-found + __systemctl $1 list-units --state inactive,failed -- $( __get_all_units ) | \ + { while read -r a b c d; do [[ $b == "loaded" ]] && echo " $a"; done; }; } +__get_restartable_units () { + # find !masked, filter out masked and not-found + __systemctl $1 list-units --state active,inactive,failed -- $( __get_all_units ) | \ + { while read -r a b c d; do [[ $b == "loaded" ]] && echo " $a"; done; }; } __get_failed_units () { __systemctl $1 list-units \ | { while read -r a b c d; do [[ $c == "failed" ]] && echo " $a"; done; }; } __get_enabled_units () { __systemctl $1 list-unit-files \ @@ -180,10 +184,7 @@ _systemctl () { elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then comps=$( __filter_units_by_property $mode CanStart yes \ - $( __get_all_units $mode \ - | while read -r line; do \ - [[ "$line" =~ @\.|\.(device|snapshot|socket|timer)$ ]] || echo " $line"; \ - done )) + $( __get_restartable_units $mode)) compopt -o filenames elif __contains_word "$verb" ${VERBS[STOPPABLE_UNITS]}; then diff --git a/shell-completion/zsh/_systemctl.in b/shell-completion/zsh/_systemctl.in index e681ec6635..ca4b899bb3 100644 --- a/shell-completion/zsh/_systemctl.in +++ b/shell-completion/zsh/_systemctl.in @@ -138,8 +138,11 @@ _filter_units_by_property() { done } +_systemctl_all_units() { { __systemctl list-unit-files; __systemctl list-units --all; } | { while read -r a b; do echo -E - " $a"; done; } } + _systemctl_active_units() {_sys_active_units=( $(__systemctl list-units | { while read -r a b; do echo -E - " $a"; done; }) )} -_systemctl_inactive_units(){_sys_inactive_units=($(__systemctl list-units --all | { while read -r a b c d; do [[ $c == "inactive" || $c == "failed" ]] && echo -E - " $a"; done; }) )} +_systemctl_startable_units(){_sys_startable_units=($(__systemctl list-units --state inactive,failed -- $(_systemctl_all_units) | { while read -r a b c d; do [[ $b == "loaded" ]] && echo -E - " $a"; done; }) )} +_systemctl_restartable_units(){_sys_restartable_units=($(__systemctl list-units --state inactive,failed,active -- $(_systemctl_all_units) | { while read -r a b c d; do [[ $b == "loaded" ]] && echo -E - " $a"; done; }) )} _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; }) )} @@ -181,8 +184,9 @@ done # Completion functions for STARTABLE_UNITS (( $+functions[_systemctl_start] )) || _systemctl_start() { - _systemctl_inactive_units - compadd "$@" -a - _sys_inactive_units + _systemctl_startable_units + compadd "$@" - $( _filter_units_by_property CanStart yes \ + ${_sys_startable_units[*]} ) } # Completion functions for STOPPABLE_UNITS @@ -217,11 +221,9 @@ done for fun in restart reload-or-restart ; do (( $+functions[_systemctl_$fun] )) || _systemctl_$fun() { - _systemctl_all_units + _systemctl_restartable_units compadd "$@" - $( _filter_units_by_property CanStart yes \ - ${_sys_all_units[*]} | while read -r line; do \ - [[ "$line" =~ \.device$ ]] || echo -E - " $line"; \ - done ) + ${_sys_restartable_units[*]} ) } done |