aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2018-04-30 12:53:50 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2018-06-11 17:09:55 +0100
commitc839b729c5f7b08f6d91bf9567d0b1f91d17e0f7 (patch)
treec3ad024d6bfd343e6aece96173693d3b7ee60600 /shell-completion
parentbash-completion: systemctl: use systemctl --no-pager (diff)
downloadsystemd-c839b729c5f7b08f6d91bf9567d0b1f91d17e0f7.tar.gz
systemd-c839b729c5f7b08f6d91bf9567d0b1f91d17e0f7.tar.bz2
systemd-c839b729c5f7b08f6d91bf9567d0b1f91d17e0f7.zip
bash-completion: systemctl: pass current partial unit to list-unit*
Pass the partial name of the unit file to list-unit-files and list-units. This allows for faster completion, since systemctl does not need to list all the unit files. For reference: - time systemctl list-unit-files -> ~200ms - time systemctl list-unit-files netctl* -> ~15ms - time systemctl list-units -> ~5ms - time systemctl list-units netctl* -> ~5ms While the list-units time itself is unaffected, now a shorter list is produced. Thus as we pass it to `systemctl show' (via __filter_units_by_properties) the execution time will be decreased even further. v2: Update list-units hunk in commit message, add quotes around $2* v3: Remove funky indentation, quote all $cur instances Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'shell-completion')
-rw-r--r--shell-completion/bash/systemctl.in48
1 files changed, 24 insertions, 24 deletions
diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in
index e493d3bd5..28981c2a7 100644
--- a/shell-completion/bash/systemctl.in
+++ b/shell-completion/bash/systemctl.in
@@ -65,35 +65,35 @@ __get_all_units () { { __systemctl $1 list-unit-files; __systemctl $1 list-
| { while read -r a b; do echo " $a"; done; }; }
__get_non_template_units() { { __systemctl $1 list-unit-files; __systemctl $1 list-units --all; } \
| { while read -r a b; do [[ $a =~ @\. ]] || echo " $a"; done; }; }
-__get_template_names () { __systemctl $1 list-unit-files \
+__get_template_names () { __systemctl $1 list-unit-files "$2*" \
| { while read -r a b; do [[ $a =~ @\. ]] && echo " ${a%%@.*}@"; done; }; }
-__get_active_units () { __systemctl $1 list-units \
+__get_active_units () { __systemctl $1 list-units "$2*" \
| { while read -r a b; do echo " $a"; done; }; }
__get_startable_units () {
# find startable inactive units
__filter_units_by_properties $1 ActiveState,CanStart inactive,yes $(
- { __systemctl $1 list-unit-files --state enabled,enabled-runtime,linked,linked-runtime,static,indirect,disabled,generated,transient | \
+ { __systemctl $1 list-unit-files --state enabled,enabled-runtime,linked,linked-runtime,static,indirect,disabled,generated,transient "$2*" | \
{ while read -r a b; do [[ $a =~ @\. ]] || echo " $a"; done; }
- __systemctl $1 list-units --state inactive,failed | \
+ __systemctl $1 list-units --state inactive,failed "$2*" | \
{ while read -r a b c; do [[ $b == "loaded" ]] && echo " $a"; done; }
} | sort -u )
}
__get_restartable_units () {
# filter out masked and not-found
__filter_units_by_property $1 CanStart yes $(
- __systemctl $1 list-unit-files --state enabled,disabled,static | \
+ __systemctl $1 list-unit-files --state enabled,disabled,static "$2*" | \
{ while read -r a b; do [[ $a =~ @\. ]] || echo " $a"; done; }
- __systemctl $1 list-units | \
+ __systemctl $1 list-units "$2*" | \
{ while read -r a b; do echo " $a"; done; } )
}
-__get_failed_units () { __systemctl $1 list-units \
+__get_failed_units () { __systemctl $1 list-units "$2*" \
| { while read -r a b c d; do [[ $c == "failed" ]] && echo " $a"; done; }; }
-__get_enabled_units () { __systemctl $1 list-unit-files \
+__get_enabled_units () { __systemctl $1 list-unit-files "$2*" \
| { while read -r a b c ; do [[ $b == "enabled" ]] && echo " $a"; done; }; }
-__get_disabled_units () { __systemctl $1 list-unit-files \
+__get_disabled_units () { __systemctl $1 list-unit-files "$2*" \
| { while read -r a b c ; do [[ $b == "disabled" ]] && echo " $a"; done; }; }
-__get_masked_units () { __systemctl $1 list-unit-files \
+__get_masked_units () { __systemctl $1 list-unit-files "$2*" \
| { while read -r a b c ; do [[ $b == "masked" ]] && echo " $a"; done; }; }
__get_all_unit_files () { { __systemctl $1 list-unit-files; } | { while read -r a b; do echo " $a"; done; }; }
@@ -220,38 +220,38 @@ _systemctl () {
compopt -o filenames
elif __contains_word "$verb" ${VERBS[ENABLED_UNITS]}; then
- comps=$( __get_enabled_units $mode )
+ comps=$( __get_enabled_units $mode "$cur" )
compopt -o filenames
elif __contains_word "$verb" ${VERBS[DISABLED_UNITS]}; then
- comps=$( __get_disabled_units $mode;
- __get_template_names $mode)
+ comps=$( __get_disabled_units $mode "$cur";
+ __get_template_names $mode "$cur")
compopt -o filenames
elif __contains_word "$verb" ${VERBS[REENABLABLE_UNITS]}; then
- comps=$( __get_disabled_units $mode;
- __get_enabled_units $mode;
- __get_template_names $mode)
+ comps=$( __get_disabled_units $mode "$cur";
+ __get_enabled_units $mode "$cur";
+ __get_template_names $mode "$cur")
compopt -o filenames
elif __contains_word "$verb" ${VERBS[STARTABLE_UNITS]}; then
- comps=$( __get_startable_units $mode;
- __get_template_names $mode)
+ comps=$( __get_startable_units $mode "$cur";
+ __get_template_names $mode "$cur")
compopt -o filenames
elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then
- comps=$( __get_restartable_units $mode;
- __get_template_names $mode)
+ comps=$( __get_restartable_units $mode "$cur";
+ __get_template_names $mode "$cur")
compopt -o filenames
elif __contains_word "$verb" ${VERBS[STOPPABLE_UNITS]}; then
comps=$( __filter_units_by_property $mode CanStop yes \
- $( __get_active_units $mode ) )
+ $( __get_active_units $mode "$cur" ) )
compopt -o filenames
elif __contains_word "$verb" ${VERBS[RELOADABLE_UNITS]}; then
comps=$( __filter_units_by_property $mode CanReload yes \
- $( __get_active_units $mode ) )
+ $( __get_active_units $mode "$cur" ) )
compopt -o filenames
elif __contains_word "$verb" ${VERBS[ISOLATABLE_UNITS]}; then
@@ -260,11 +260,11 @@ _systemctl () {
compopt -o filenames
elif __contains_word "$verb" ${VERBS[FAILED_UNITS]}; then
- comps=$( __get_failed_units $mode )
+ comps=$( __get_failed_units $mode "$cur" )
compopt -o filenames
elif __contains_word "$verb" ${VERBS[MASKED_UNITS]}; then
- comps=$( __get_masked_units $mode )
+ comps=$( __get_masked_units $mode "$cur" )
compopt -o filenames
elif __contains_word "$verb" ${VERBS[TARGET_AND_UNITS]}; then