[systemd-commits] 2 commits - bash-completion/systemd-bash-completion.sh
Michal Schmidt
michich at kemper.freedesktop.org
Wed May 9 00:58:13 PDT 2012
bash-completion/systemd-bash-completion.sh | 48 ++++++++++++++---------------
1 file changed, 24 insertions(+), 24 deletions(-)
New commits:
commit f6a68149479a0746fe753deba1bfbf26eb13566f
Author: Michal Schmidt <mschmidt at redhat.com>
Date: Wed May 9 09:36:20 2012 +0200
bash-completion: use printf instead of echo
If the expanded argument begins with '-', echo would try to interpret
it as options.
printf does not have this problem. Use it everywhere.
diff --git a/bash-completion/systemd-bash-completion.sh b/bash-completion/systemd-bash-completion.sh
index e60a486..9cd439c 100644
--- a/bash-completion/systemd-bash-completion.sh
+++ b/bash-completion/systemd-bash-completion.sh
@@ -33,25 +33,25 @@ __filter_units_by_property () {
<(__systemctl show --property "$property" -- "${units[@]}")
for ((i=0; $i < ${#units[*]}; i++)); do
if [[ "${props[i]}" = "$property=$value" ]]; then
- echo "${units[i]}"
+ printf "%s\n" "${units[i]}"
fi
done
}
__get_all_units () { __systemctl list-units --all \
- | { while read -r a b; do echo "$a"; done; }; }
+ | { while read -r a b; do printf "%s\n" "$a"; done; }; }
__get_active_units () { __systemctl list-units \
- | { while read -r a b; do echo "$a"; done; }; }
+ | { 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" ]] && echo "$a"; done; }; }
+ | { 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" ]] && echo "$a"; done; }; }
+ | { 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" ]] && echo "$a"; done; }; }
+ | { 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" ]] && echo "$a"; done; }; }
+ | { 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" ]] && echo "$a"; done; }; }
+ | { while read -r a b c ; do [[ $b == "masked" ]] && printf "%s\n" "$a"; done; }; }
_systemctl () {
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
@@ -144,14 +144,14 @@ _systemctl () {
comps=$( __filter_units_by_property CanStart yes \
$( __get_inactive_units \
| while read -r line; do \
- [[ "$line" =~ \.(device|snapshot)$ ]] || echo "$line"; \
+ [[ "$line" =~ \.(device|snapshot)$ ]] || printf "%s\n" "$line"; \
done ))
elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then
comps=$( __filter_units_by_property CanStart yes \
$( __get_all_units \
| while read -r line; do \
- [[ "$line" =~ \.(device|snapshot|socket|timer)$ ]] || echo "$line"; \
+ [[ "$line" =~ \.(device|snapshot|socket|timer)$ ]] || printf "%s\n" "$line"; \
done ))
elif __contains_word "$verb" ${VERBS[STOPPABLE_UNITS]}; then
@@ -176,15 +176,15 @@ _systemctl () {
comps=''
elif __contains_word "$verb" ${VERBS[JOBS]}; then
- comps=$( __systemctl list-jobs | { while read -r a b; do echo "$a"; done; } )
+ comps=$( __systemctl list-jobs | { while read -r a b; do printf "%s\n" "$a"; done; } )
elif __contains_word "$verb" ${VERBS[SNAPSHOTS]}; then
comps=$( __systemctl list-units --type snapshot --full --all \
- | { while read -r a b; do echo "$a"; done; } )
+ | { while read -r a b; do printf "%s\n" "$a"; done; } )
elif __contains_word "$verb" ${VERBS[ENVS]}; then
comps=$( __systemctl show-environment \
- | while read -r line; do echo "${line%%=*}=";done )
+ | while read -r line; do printf "%s\n" "${line%%=*}=";done )
compopt -o nospace
elif __contains_word "$verb" ${VERBS[FILE]}; then
@@ -197,9 +197,9 @@ _systemctl () {
}
complete -F _systemctl systemctl
-__get_all_sessions () { systemd-loginctl list-sessions | { while read -r a b; do echo "$a"; done; } ; }
-__get_all_users () { systemd-loginctl list-users | { while read -r a b; do echo "$b"; done; } ; }
-__get_all_seats () { systemd-loginctl list-seats | { while read -r a b; do echo "$a"; done; } ; }
+__get_all_sessions () { systemd-loginctl list-sessions | { while read -r a b; do printf "%s\n" "$a"; done; } ; }
+__get_all_users () { systemd-loginctl list-users | { while read -r a b; do printf "%s\n" "$b"; done; } ; }
+__get_all_seats () { systemd-loginctl list-seats | { while read -r a b; do printf "%s\n" "$a"; done; } ; }
_loginctl () {
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
commit f3b17661550da58231139e6aa37848172a385fd2
Author: Michal Schmidt <mschmidt at redhat.com>
Date: Wed May 9 09:18:44 2012 +0200
bash-completion: avoid losing backslashes in unit names
Use 'read -r' everywhere to consider backslashes as parts of the input line.
Single-quote the arguments to 'compgen -W' to avoid immediate expansion.
compgen itself will expand the argument.
Fixes a possible reason for "Failed to issue method call: Unknown unit"
after requesting completion.
https://bugzilla.redhat.com/show_bug.cgi?id=814966
diff --git a/bash-completion/systemd-bash-completion.sh b/bash-completion/systemd-bash-completion.sh
index 25ab0c5..e60a486 100644
--- a/bash-completion/systemd-bash-completion.sh
+++ b/bash-completion/systemd-bash-completion.sh
@@ -39,19 +39,19 @@ __filter_units_by_property () {
}
__get_all_units () { __systemctl list-units --all \
- | { while read a b; do echo "$a"; done; }; }
+ | { while read -r a b; do echo "$a"; done; }; }
__get_active_units () { __systemctl list-units \
- | { while read a b; do echo "$a"; done; }; }
+ | { while read -r a b; do echo "$a"; done; }; }
__get_inactive_units () { __systemctl list-units --all \
- | { while read a b c d; do [[ $c == "inactive" ]] && echo "$a"; done; }; }
+ | { while read -r a b c d; do [[ $c == "inactive" ]] && echo "$a"; done; }; }
__get_failed_units () { __systemctl list-units \
- | { while read a b c d; do [[ $c == "failed" ]] && echo "$a"; done; }; }
+ | { while read -r a b c d; do [[ $c == "failed" ]] && echo "$a"; done; }; }
__get_enabled_units () { __systemctl list-unit-files \
- | { while read a b c ; do [[ $b == "enabled" ]] && echo "$a"; done; }; }
+ | { while read -r a b c ; do [[ $b == "enabled" ]] && echo "$a"; done; }; }
__get_disabled_units () { __systemctl list-unit-files \
- | { while read a b c ; do [[ $b == "disabled" ]] && echo "$a"; done; }; }
+ | { while read -r a b c ; do [[ $b == "disabled" ]] && echo "$a"; done; }; }
__get_masked_units () { __systemctl list-unit-files \
- | { while read a b c ; do [[ $b == "masked" ]] && echo "$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]}
@@ -89,13 +89,13 @@ _systemctl () {
comps=''
;;
esac
- COMPREPLY=( $(compgen -W "$comps" -- "$cur") )
+ COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
return 0
fi
if [[ "$cur" = -* ]]; then
- COMPREPLY=( $(compgen -W "${OPTS[*]}" -- "$cur") )
+ COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
return 0
fi
@@ -143,14 +143,14 @@ _systemctl () {
elif __contains_word "$verb" ${VERBS[STARTABLE_UNITS]}; then
comps=$( __filter_units_by_property CanStart yes \
$( __get_inactive_units \
- | while read line; do \
+ | while read -r line; do \
[[ "$line" =~ \.(device|snapshot)$ ]] || echo "$line"; \
done ))
elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then
comps=$( __filter_units_by_property CanStart yes \
$( __get_all_units \
- | while read line; do \
+ | while read -r line; do \
[[ "$line" =~ \.(device|snapshot|socket|timer)$ ]] || echo "$line"; \
done ))
@@ -176,15 +176,15 @@ _systemctl () {
comps=''
elif __contains_word "$verb" ${VERBS[JOBS]}; then
- comps=$( __systemctl list-jobs | { while read a b; do echo "$a"; done; } )
+ comps=$( __systemctl 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 a b; do echo "$a"; done; } )
+ | { while read -r a b; do echo "$a"; done; } )
elif __contains_word "$verb" ${VERBS[ENVS]}; then
comps=$( __systemctl show-environment \
- | while read line; do echo "${line%%=*}=";done )
+ | while read -r line; do echo "${line%%=*}=";done )
compopt -o nospace
elif __contains_word "$verb" ${VERBS[FILE]}; then
@@ -192,14 +192,14 @@ _systemctl () {
compopt -o filenames
fi
- COMPREPLY=( $(compgen -W "$comps" -- "$cur") )
+ COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
return 0
}
complete -F _systemctl systemctl
-__get_all_sessions () { systemd-loginctl list-sessions | { while read a b; do echo "$a"; done; } ; }
-__get_all_users () { systemd-loginctl list-users | { while read a b; do echo "$b"; done; } ; }
-__get_all_seats () { systemd-loginctl list-seats | { while read a b; do echo "$a"; done; } ; }
+__get_all_sessions () { systemd-loginctl list-sessions | { while read -r a b; do echo "$a"; done; } ; }
+__get_all_users () { systemd-loginctl list-users | { while read -r a b; do echo "$b"; done; } ; }
+__get_all_seats () { systemd-loginctl list-seats | { while read -r a b; do echo "$a"; done; } ; }
_loginctl () {
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
@@ -225,13 +225,13 @@ _loginctl () {
comps=''
;;
esac
- COMPREPLY=( $(compgen -W "$comps" -- "$cur") )
+ COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
return 0
fi
if [[ "$cur" = -* ]]; then
- COMPREPLY=( $(compgen -W "${OPTS[*]}" -- "$cur") )
+ COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
return 0
fi
@@ -275,7 +275,7 @@ _loginctl () {
fi
fi
- COMPREPLY=( $(compgen -W "$comps" -- "$cur") )
+ COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
return 0
}
complete -F _loginctl loginctl
More information about the systemd-commits
mailing list