SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shell-completion: propose templates for disable/[re]enable/[re]start

Browse Source 
Templates can be [re]enabled, on their own if the have DefaultInstance set,
and with an instance suffix in all cases. Propose just the template name
ending in @, to underline the instance suffix may have to be appended.

Likewise for start/restart.

This means that sometimes superflous units that one will not really
want to operate on will be proposed, but this seems better than
proposing a very incomplete set of names.

https://bugs.freedesktop.org/show_bug.cgi?id=66912
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2014-10-14 21:20:05 -04:00
parent f29c77bc01
commit e9a19bd882
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell-completion/zsh/_systemctl.in
+13 -7
View File
@@ -139,6 +139,8 @@ _filter_units_by_property() {
}
_systemctl_all_units() { { __systemctl list-unit-files; __systemctl list-units --all; } | { while read -r a b; do echo -E - " $a"; done; } }
_systemctl_get_template_names() { __systemctl list-unit-files | { while read -r a b; do [[ $a =~ @\. ]] && echo -E - " ${a%%@.*}@"; done; } }
_systemctl_active_units() {_sys_active_units=( $(__systemctl list-units | { while read -r a b; do 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; }) )}
@@ -158,20 +160,24 @@ for fun in is-active is-failed is-enabled status show cat mask preset help list-
done
# Completion functions for ENABLED_UNITS
for fun in disable reenable ; do
(( $+functions[_systemctl_$fun] )) || _systemctl_$fun()
{
(( $+functions[_systemctl_disable] )) || _systemctl_disable()
{
_systemctl_enabled_units
compadd "$@" -a - _sys_enabled_units
}
(( $+functions[_systemctl_reenable] )) || _systemctl_reenable()
{
_systemctl_enabled_units
_systemctl_disabled_units
compadd "$@" -a - _sys_enabled_units _sys_disabled_units
}
done
compadd "$@" -a - _sys_enabled_units _sys_disabled_units $(_systemctl_get_template_names)
}
# Completion functions for DISABLED_UNITS
(( $+functions[_systemctl_enable] )) || _systemctl_enable()
{
_systemctl_disabled_units
compadd "$@" -a - _sys_disabled_units
compadd "$@" -a - _sys_disabled_units $(_systemctl_get_template_names)
}
# Completion functions for FAILED_UNITS