chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: downgrade vaccuum message to debug level
[elogind.git]
/
shell-completion
/
bash
/
systemctl
diff --git
a/shell-completion/bash/systemctl
b/shell-completion/bash/systemctl
index a05b756980d5afce4c305d62ef6e117c798bf275..dc7ef6689820054018d28c0e3159584bb09f3547 100644
(file)
--- a/
shell-completion/bash/systemctl
+++ b/
shell-completion/bash/systemctl
@@
-32,9
+32,10
@@
__systemd_properties() {
}
__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 () {
@@
-70,10
+71,10
@@
_systemctl () {
local i verb comps mode
local -A OPTS=(
local i verb comps mode
local -A OPTS=(
- [STANDALONE]='--all -a --reverse --after --before --defaults --fail --ignore-dependencies --failed --force -f --full --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
)
if __contains_word "--user" ${COMP_WORDS[*]}; then
@@
-90,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'
;;
@@
-117,7
+123,7
@@
_systemctl () {
fi
local -A VERBS=(
fi
local -A VERBS=(
- [ALL_UNITS]='is-active is-failed is-enabled status show mask preset help list-dependencies'
+ [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'
@@
-131,16
+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 get-default'
- [NAME]='snapshot
load
'
+ list-
sockets list-timers list-units list-unit-files poweroff
+
reboot rescue
show-environment suspend get-default'
+ [NAME]='snapshot'
[FILE]='link'
[TARGETS]='set-default'
)
[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]}
@@
-148,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