chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journalctl,loginctl,systemctl,systemd-cgls: add -l as alias for --full
[elogind.git]
/
shell-completion
/
bash
/
systemctl
diff --git
a/shell-completion/bash/systemctl
b/shell-completion/bash/systemctl
index aba76f65433ea5b17d92a863360a745c85eec732..ceca3348eddc2d1c6dd23aafd5a2417459356cfa 100644
(file)
--- a/
shell-completion/bash/systemctl
+++ b/
shell-completion/bash/systemctl
@@
-22,6
+22,15
@@
__systemctl() {
systemctl $mode --full --no-legend "$@"
}
systemctl $mode --full --no-legend "$@"
}
+__systemd_properties() {
+ local mode=$1
+ { __systemctl -a $mode show;
+ systemd --dump-configuration-items; } |
+ while IFS='=' read -r key value; do
+ [[ $value ]] && echo "$key"
+ done
+}
+
__contains_word () {
local word=$1; shift
for w in $*; do [[ $w = $word ]] && return 0; done
__contains_word () {
local word=$1; shift
for w in $*; do [[ $w = $word ]] && return 0; done
@@
-45,7
+54,7
@@
__get_all_units () { __systemctl $1 list-units --all \
| { 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; }; }
| { 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_
inactive_units () { __systemctl $1 list-units --all
\
+__get_
startable_units () { __systemctl $1 list-units --all -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_failed_units () { __systemctl $1 list-units \
| { while read -r a b c d; do [[ $c == "failed" ]] && echo " $a"; done; }; }
| { while read -r a b c d; do [[ $c == "inactive" || $c == "failed " ]] && echo " $a"; done; }; }
__get_failed_units () { __systemctl $1 list-units \
| { while read -r a b c d; do [[ $c == "failed" ]] && echo " $a"; done; }; }
@@
-61,12
+70,18
@@
_systemctl () {
local i verb comps mode
local -A OPTS=(
local i verb comps mode
local -A OPTS=(
- [STANDALONE]='--all -a --
defaults --fail --ignore-dependencies --failed --force -f --ful
l --global
+ [STANDALONE]='--all -a --
reverse --after --before --defaults --fail --ignore-dependencies --failed --force -f --full -
l --global
--help -h --no-ask-password --no-block --no-legend --no-pager --no-reload --no-wall
--quiet -q --privileged -P --system --user --version --runtime'
[ARG]='--host -H --kill-mode --kill-who --property -p --signal -s --type -t --root'
)
--help -h --no-ask-password --no-block --no-legend --no-pager --no-reload --no-wall
--quiet -q --privileged -P --system --user --version --runtime'
[ARG]='--host -H --kill-mode --kill-who --property -p --signal -s --type -t --root'
)
+ if __contains_word "--user" ${COMP_WORDS[*]}; then
+ mode=--user
+ else
+ mode=--system
+ fi
+
if __contains_word "$prev" ${OPTS[ARG]}; then
case $prev in
--signal|-s)
if __contains_word "$prev" ${OPTS[ARG]}; then
case $prev in
--signal|-s)
@@
-89,7
+104,7
@@
_systemctl () {
comps=$(compgen -A hostname)
;;
--property|-p)
comps=$(compgen -A hostname)
;;
--property|-p)
- comps=
''
+ comps=
$(__systemd_properties $mode)
;;
esac
COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
;;
esac
COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
@@
-101,14
+116,8
@@
_systemctl () {
return 0
fi
return 0
fi
- if __contains_word "--user" ${COMP_WORDS[*]}; then
- mode=--user
- else
- mode=--system
- fi
-
local -A VERBS=(
local -A VERBS=(
- [ALL_UNITS]='is-active is-failed is-enabled status show mask preset'
+ [ALL_UNITS]='is-active is-failed is-enabled status show mask preset
help list-dependencies
'
[ENABLED_UNITS]='disable'
[DISABLED_UNITS]='enable'
[REENABLABLE_UNITS]='reenable'
[ENABLED_UNITS]='disable'
[DISABLED_UNITS]='enable'
[REENABLABLE_UNITS]='reenable'
@@
-125,9
+134,10
@@
_systemctl () {
[STANDALONE]='daemon-reexec daemon-reload default dump
emergency exit halt hibernate hybrid-sleep kexec list-jobs
list-units list-unit-files poweroff reboot rescue
[STANDALONE]='daemon-reexec daemon-reload default dump
emergency exit halt hibernate hybrid-sleep kexec list-jobs
list-units list-unit-files poweroff reboot rescue
- show-environment suspend'
+ show-environment suspend
get-default
'
[NAME]='snapshot load'
[FILE]='link'
[NAME]='snapshot load'
[FILE]='link'
+ [TARGETS]='set-default'
)
for ((i=0; $i <= $COMP_CWORD; i++)); do
)
for ((i=0; $i <= $COMP_CWORD; i++)); do
@@
-156,10
+166,7
@@
_systemctl () {
elif __contains_word "$verb" ${VERBS[STARTABLE_UNITS]}; then
comps=$( __filter_units_by_property $mode CanStart yes \
elif __contains_word "$verb" ${VERBS[STARTABLE_UNITS]}; then
comps=$( __filter_units_by_property $mode CanStart yes \
- $( __get_inactive_units $mode \
- | while read -r line; do \
- [[ "$line" =~ \.(device|snapshot)$ ]] || echo " $line"; \
- done ))
+ $( __get_startable_units $mode))
elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then
comps=$( __filter_units_by_property $mode CanStart yes \
elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then
comps=$( __filter_units_by_property $mode CanStart yes \
@@
-204,6
+211,9
@@
_systemctl () {
elif __contains_word "$verb" ${VERBS[FILE]}; then
comps=$( compgen -A file -- "$cur" )
compopt -o filenames
elif __contains_word "$verb" ${VERBS[FILE]}; then
comps=$( compgen -A file -- "$cur" )
compopt -o filenames
+ elif __contains_word "$verb" ${VERBS[TARGETS]}; then
+ comps=$( __systemctl $mode list-unit-files --type target --full --all \
+ | { while read -r a b; do echo " $a"; done; } )
fi
COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
fi
COMPREPLY=( $(compgen -W '$comps' -- "$cur") )