From e44731b91ad77e04bf26de21d1605bbe342577c6 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Wed, 29 Oct 2014 23:06:58 -0400

Subject: [PATCH] bash-completion: use improved filtering to make things faster

(cherry picked from commit 372b221166eb586c4f767969f442ed940e21f353)

---

 shell-completion/bash/systemctl.in | 16 +++++++++++-----

 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in

index 9e538a9a5b..9e98a1850e 100644

--- a/shell-completion/bash/systemctl.in

+++ b/shell-completion/bash/systemctl.in

@@ -60,14 +60,20 @@ __get_active_units   () { __systemctl $1 list-units       \

         | { while read -r a b; do echo " $a"; done; }; }

 __get_startable_units () {

         # find startable inactive units

-        __filter_units_by_property $mode LoadState loaded $(

-            __filter_units_by_property $mode ActiveState inactive $(

-                __filter_units_by_property $mode CanStart yes $( __get_all_units )))

+        __filter_units_by_property $mode ActiveState inactive $(

+            __filter_units_by_property $mode CanStart yes $(

+                __systemctl $mode list-unit-files --state enabled,disabled,static | \

+                    { while read -r a b; do [[ $a =~ @\. ]] || echo " $a"; done; }

+                __systemctl $mode list-units --state inactive,failed | \

+                    { while read -r a b; do echo " $a"; done; } ))

 }

 __get_restartable_units () {

         # filter out masked and not-found

-        __filter_units_by_property $mode LoadState loaded $(

-            __filter_units_by_property $mode CanStart yes $( __get_all_units ))

+        __filter_units_by_property $mode CanStart yes $(

+            __systemctl $mode list-unit-files --state enabled,disabled,static | \

+                    { while read -r a b; do [[ $a =~ @\. ]] || echo " $a"; done; }

+            __systemctl $mode list-units | \

+                    { while read -r a b; do echo " $a"; done; } )

 }

 __get_failed_units   () { __systemctl $1 list-units       \

         | { while read -r a b c d; do [[ $c == "failed"   ]] && echo " $a"; done; }; }