shell-completion: replace printf with echo
It is faster to use a bash built-in, then to invoke an external program. The problem of unit names starting with a dash is solved by prepending a space. Spaces are ignored anyway. For zsh, replace echo "$unit", which is vulnerable to dashes, with echo " $unit".
This commit is contained in:
parent
75add28aa1
commit
79c1638303
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue