chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
login: set pos-slot to fallback on pos-eviction
[elogind.git]
/
shell-completion
/
bash
/
systemctl
diff --git
a/shell-completion/bash/systemctl
b/shell-completion/bash/systemctl
index f24a1454245b8afb2032f1e0fa582ed5796417f8..dc7ef6689820054018d28c0e3159584bb09f3547 100644
(file)
--- a/
shell-completion/bash/systemctl
+++ b/
shell-completion/bash/systemctl
@@
-22,10
+22,20
@@
__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 () {
__contains_word () {
- local word=$1; shift
- for w in $*; do [[ $w = $word ]] && return 0; done
- return 1
+ local w word=$1; shift
+ for w in "$@"; do
+ [[ $w = "$word" ]] && return
+ done
}
__filter_units_by_property () {
}
__filter_units_by_property () {
@@
-61,12
+71,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'
--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'
+ [ARG]='--host -H --kill-mode --kill-who --property -p --signal -s --type -t --
state --
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)
@@
-75,6
+91,11
@@
_systemctl () {
--type|-t)
comps='automount device mount path service snapshot socket swap target timer'
;;
--type|-t)
comps='automount device mount path service snapshot socket swap target timer'
;;
+ --state)
+ comps='loaded not-found stub
+ active inactive
+ dead elapsed exited listening mounted plugged running waiting'
+ ;;
--kill-who)
comps='all control main'
;;
--kill-who)
comps='all control main'
;;
@@
-89,7
+110,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
+122,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
cat mask preset help list-dependencies
'
[ENABLED_UNITS]='disable'
[DISABLED_UNITS]='enable'
[REENABLABLE_UNITS]='reenable'
[ENABLED_UNITS]='disable'
[DISABLED_UNITS]='enable'
[REENABLABLE_UNITS]='reenable'
@@
-122,15
+137,16
@@
_systemctl () {
[JOBS]='cancel'
[SNAPSHOTS]='delete'
[ENVS]='set-environment unset-environment'
[JOBS]='cancel'
[SNAPSHOTS]='delete'
[ENVS]='set-environment unset-environment'
- [STANDALONE]='daemon-reexec daemon-reload default
dump
+ [STANDALONE]='daemon-reexec daemon-reload default
emergency exit halt hibernate hybrid-sleep kexec list-jobs
emergency exit halt hibernate hybrid-sleep kexec list-jobs
- list-
units list-unit-files poweroff reboot rescue
-
show-environment suspend
'
- [NAME]='snapshot
load
'
+ list-
sockets list-timers list-units list-unit-files poweroff
+
reboot rescue show-environment suspend get-default
'
+ [NAME]='snapshot'
[FILE]='link'
[FILE]='link'
+ [TARGETS]='set-default'
)
)
- for ((i=0;
$i <= $
COMP_CWORD; i++)); do
+ for ((i=0;
i <
COMP_CWORD; i++)); do
if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
verb=${COMP_WORDS[i]}
if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
verb=${COMP_WORDS[i]}
@@
-138,7
+154,7
@@
_systemctl () {
fi
done
fi
done
- if
[[ -z $verb ]]; then
+ if [[ -z $verb ]]; then
comps="${VERBS[*]}"
elif __contains_word "$verb" ${VERBS[ALL_UNITS]}; then
comps="${VERBS[*]}"
elif __contains_word "$verb" ${VERBS[ALL_UNITS]}; then
@@
-201,6
+217,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") )