X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=shell-completion%2Fbash%2Fsystemctl;h=b019d6aecf5683c18cd3a6722b1a9783e0083f23;hp=ce46d50a917cb9b562c2a78e1d7067f34d7eef69;hb=79c1638303142b81e1b72dd5bde0c656ccf19999;hpb=9e542e0b3a5069f340072c93b5d2283848a42a2e diff --git a/shell-completion/bash/systemctl b/shell-completion/bash/systemctl index ce46d50a9..b019d6aec 100644 --- a/shell-completion/bash/systemctl +++ b/shell-completion/bash/systemctl @@ -36,25 +36,25 @@ __filter_units_by_property () { <(__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 $1 list-units --all \ - | { while read -r a b; do printf "%s\n" "$a"; done; }; } + | { while read -r a b; do echo " $a"; done; }; } __get_active_units () { __systemctl $1 list-units \ - | { while read -r a b; do printf "%s\n" "$a"; done; }; } + | { while read -r a b; do echo " $a"; done; }; } __get_inactive_units () { __systemctl $1 list-units --all \ - | { while read -r a b c d; do [[ $c == "inactive" ]] && printf "%s\n" "$a"; done; }; } + | { while read -r a b c d; do [[ $c == "inactive" ]] && echo " $a"; done; }; } __get_failed_units () { __systemctl $1 list-units \ - | { while read -r a b c d; do [[ $c == "failed" ]] && printf "%s\n" "$a"; done; }; } + | { 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" ]] && printf "%s\n" "$a"; done; }; } + | { 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" ]] && printf "%s\n" "$a"; done; }; } + | { 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" ]] && printf "%s\n" "$a"; done; }; } + | { 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]} @@ -153,14 +153,14 @@ _systemctl () { comps=$( __filter_units_by_property $mode CanStart yes \ $( __get_inactive_units $mode \ | while read -r line; do \ - [[ "$line" =~ \.(device|snapshot)$ ]] || printf "%s\n" "$line"; \ + [[ "$line" =~ \.(device|snapshot)$ ]] || echo " $line"; \ done )) elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then 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 @@ -185,15 +185,15 @@ _systemctl () { comps='' elif __contains_word "$verb" ${VERBS[JOBS]}; then - comps=$( __systemctl $mode 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 $mode list-units --type snapshot --full --all \ - | { while read -r a b; do printf "%s\n" "$a"; done; } ) + | { while read -r a b; do echo " $a"; done; } ) elif __contains_word "$verb" ${VERBS[ENVS]}; then comps=$( __systemctl $mode show-environment \ - | while read -r line; do printf "%s\n" "${line%%=*}=";done ) + | while read -r line; do echo " ${line%%=*}=";done ) compopt -o nospace elif __contains_word "$verb" ${VERBS[FILE]}; then