X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=shell-completion%2Fbash%2Fsystemctl;h=f5829b72f80fb2fd9a971e84c6d627f146429655;hp=27d89ec13a105c8313189bec46c5547f83fa4140;hb=bf83067c1ded45c1ba1d9d679e6190a5de51f960;hpb=d611dadcc74db10ba533ee6859308f5fc505aee1 diff --git a/shell-completion/bash/systemctl b/shell-completion/bash/systemctl index 27d89ec13..f5829b72f 100644 --- a/shell-completion/bash/systemctl +++ b/shell-completion/bash/systemctl @@ -18,7 +18,17 @@ # along with systemd; If not, see . __systemctl() { - systemctl --full --no-legend "$@" + local mode=$1; shift 1 + 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 () { @@ -28,36 +38,36 @@ __contains_word () { } __filter_units_by_property () { - local property=$1 value=$2 ; shift 2 + local mode=$1 property=$2 value=$3 ; shift 3 local units=("$@") local props IFS=$'\n' read -rd '' -a props < \ - <(__systemctl show --property "$property" -- "${units[@]}") + <(__systemctl $mode show --property "$property" -- "${units[@]}") for ((i=0; $i < ${#units[*]}; i++)); do if [[ "${props[i]}" = "$property=$value" ]]; then - printf "%s\n" "${units[i]}" + echo " ${units[i]}" fi done } -__get_all_units () { __systemctl list-units --all \ - | { while read -r a b; do printf "%s\n" "$a"; done; }; } -__get_active_units () { __systemctl list-units \ - | { while read -r a b; do printf "%s\n" "$a"; done; }; } -__get_inactive_units () { __systemctl list-units --all \ - | { while read -r a b c d; do [[ $c == "inactive" ]] && printf "%s\n" "$a"; done; }; } -__get_failed_units () { __systemctl list-units \ - | { while read -r a b c d; do [[ $c == "failed" ]] && printf "%s\n" "$a"; done; }; } -__get_enabled_units () { __systemctl list-unit-files \ - | { while read -r a b c ; do [[ $b == "enabled" ]] && printf "%s\n" "$a"; done; }; } -__get_disabled_units () { __systemctl list-unit-files \ - | { while read -r a b c ; do [[ $b == "disabled" ]] && printf "%s\n" "$a"; done; }; } -__get_masked_units () { __systemctl list-unit-files \ - | { while read -r a b c ; do [[ $b == "masked" ]] && printf "%s\n" "$a"; done; }; } +__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; }; } +__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; }; } +__get_enabled_units () { __systemctl $1 list-unit-files \ + | { while read -r a b c ; do [[ $b == "enabled" ]] && echo " $a"; done; }; } +__get_disabled_units () { __systemctl $1 list-unit-files \ + | { while read -r a b c ; do [[ $b == "disabled" ]] && echo " $a"; done; }; } +__get_masked_units () { __systemctl $1 list-unit-files \ + | { while read -r a b c ; do [[ $b == "masked" ]] && echo " $a"; done; }; } _systemctl () { local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} - local i verb comps + local i verb comps mode local -A OPTS=( [STANDALONE]='--all -a --defaults --fail --ignore-dependencies --failed --force -f --full --global @@ -66,6 +76,12 @@ _systemctl () { [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) @@ -88,23 +104,23 @@ _systemctl () { comps=$(compgen -A hostname) ;; --property|-p) - comps='' + comps=$(__systemd_properties $mode) ;; esac COMPREPLY=( $(compgen -W '$comps' -- "$cur") ) return 0 fi - if [[ "$cur" = -* ]]; then COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") ) return 0 fi local -A VERBS=( - [ALL_UNITS]='is-active is-failed is-enabled status show mask preset' - [ENABLED_UNITS]='disable reenable' + [ALL_UNITS]='is-active is-failed is-enabled status show mask preset help' + [ENABLED_UNITS]='disable' [DISABLED_UNITS]='enable' + [REENABLABLE_UNITS]='reenable' [FAILED_UNITS]='reset-failed' [STARTABLE_UNITS]='start' [STOPPABLE_UNITS]='stop condstop kill try-restart condrestart' @@ -135,59 +151,60 @@ _systemctl () { comps="${VERBS[*]}" elif __contains_word "$verb" ${VERBS[ALL_UNITS]}; then - comps=$( __get_all_units ) + comps=$( __get_all_units $mode ) elif __contains_word "$verb" ${VERBS[ENABLED_UNITS]}; then - comps=$( __get_enabled_units ) + comps=$( __get_enabled_units $mode ) elif __contains_word "$verb" ${VERBS[DISABLED_UNITS]}; then - comps=$( __get_disabled_units ) + comps=$( __get_disabled_units $mode ) + + elif __contains_word "$verb" ${VERBS[REENABLABLE_UNITS]}; then + comps=$( __get_disabled_units $mode; + __get_enabled_units $mode ) elif __contains_word "$verb" ${VERBS[STARTABLE_UNITS]}; then - comps=$( __filter_units_by_property CanStart yes \ - $( __get_inactive_units \ - | while read -r line; do \ - [[ "$line" =~ \.(device|snapshot)$ ]] || printf "%s\n" "$line"; \ - done )) + comps=$( __filter_units_by_property $mode CanStart yes \ + $( __get_startable_units $mode)) elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then - comps=$( __filter_units_by_property CanStart yes \ - $( __get_all_units \ + comps=$( __filter_units_by_property $mode CanStart yes \ + $( __get_all_units $mode \ | while read -r line; do \ - [[ "$line" =~ \.(device|snapshot|socket|timer)$ ]] || printf "%s\n" "$line"; \ + [[ "$line" =~ \.(device|snapshot|socket|timer)$ ]] || echo " $line"; \ done )) elif __contains_word "$verb" ${VERBS[STOPPABLE_UNITS]}; then - comps=$( __filter_units_by_property CanStop yes \ - $( __get_active_units ) ) + comps=$( __filter_units_by_property $mode CanStop yes \ + $( __get_active_units $mode ) ) elif __contains_word "$verb" ${VERBS[RELOADABLE_UNITS]}; then - comps=$( __filter_units_by_property CanReload yes \ - $( __get_active_units ) ) + comps=$( __filter_units_by_property $mode CanReload yes \ + $( __get_active_units $mode ) ) elif __contains_word "$verb" ${VERBS[ISOLATABLE_UNITS]}; then - comps=$( __filter_units_by_property AllowIsolate yes \ - $( __get_all_units ) ) + comps=$( __filter_units_by_property $mode AllowIsolate yes \ + $( __get_all_units $mode ) ) elif __contains_word "$verb" ${VERBS[FAILED_UNITS]}; then - comps=$( __get_failed_units ) + comps=$( __get_failed_units $mode ) elif __contains_word "$verb" ${VERBS[MASKED_UNITS]}; then - comps=$( __get_masked_units ) + comps=$( __get_masked_units $mode ) elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[NAME]}; then comps='' elif __contains_word "$verb" ${VERBS[JOBS]}; then - comps=$( __systemctl list-jobs | { while read -r a b; do printf "%s\n" "$a"; done; } ) + comps=$( __systemctl $mode list-jobs | { while read -r a b; do echo " $a"; done; } ) elif __contains_word "$verb" ${VERBS[SNAPSHOTS]}; then - comps=$( __systemctl list-units --type snapshot --full --all \ - | { while read -r a b; do printf "%s\n" "$a"; done; } ) + comps=$( __systemctl $mode list-units --type snapshot --full --all \ + | { while read -r a b; do echo " $a"; done; } ) elif __contains_word "$verb" ${VERBS[ENVS]}; then - comps=$( __systemctl show-environment \ - | while read -r line; do printf "%s\n" "${line%%=*}=";done ) + comps=$( __systemctl $mode show-environment \ + | while read -r line; do echo " ${line%%=*}=";done ) compopt -o nospace elif __contains_word "$verb" ${VERBS[FILE]}; then