[systemd-devel] [PATCH] bash-completion: --property support

Zbigniew Jędrzejewski-Szmek zbyszek at in.waw.pl
Tue Apr 16 10:48:14 PDT 2013


---
It turns out that simply fetching the list is fast enough.
At least on my relatively beefy machine. And this approach
is quite easy. So I think we can do that.

Zbyszek

 shell-completion/bash/systemctl | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/shell-completion/bash/systemctl b/shell-completion/bash/systemctl
index f24a145..2c004d9 100644
--- a/shell-completion/bash/systemctl
+++ b/shell-completion/bash/systemctl
@@ -22,6 +22,17 @@ __systemctl() {
         systemctl $mode --full --no-legend "$@"
 }
 
+__systemd_properties() {
+        local mode=$1; shift 1
+        { __systemctl $mode show;
+         systemd --dump-configuration-items; } |
+        while read -r line; do
+            if [[ "$line" =~ .*= ]]; then
+                echo ${line%%=*}
+            fi
+        done
+}
+
 __contains_word () {
         local word=$1; shift
         for w in $*; do [[ $w = $word ]] && return 0; done
@@ -67,6 +78,12 @@ _systemctl () {
                       [ARG]='--host -H --kill-mode --kill-who --property -p --signal -s --type -t --root'
         )
 
+        if __contains_word "--user" ${COMP_WORDS[*]}; then
+            mode=--user
+        else
+            mode=--system
+        fi
+
         if __contains_word "$prev" ${OPTS[ARG]}; then
                 case $prev in
                         --signal|-s)
@@ -89,7 +106,7 @@ _systemctl () {
                                 comps=$(compgen -A hostname)
                         ;;
                         --property|-p)
-                                comps=''
+                                comps=$(__systemd_properties $mode)
                         ;;
                 esac
                 COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
@@ -101,12 +118,6 @@ _systemctl () {
                 return 0
         fi
 
-        if __contains_word "--user" ${COMP_WORDS[*]}; then
-            mode=--user
-        else
-            mode=--system
-        fi
-
         local -A VERBS=(
                 [ALL_UNITS]='is-active is-failed is-enabled status show mask preset'
             [ENABLED_UNITS]='disable'
-- 
1.8.2



More information about the systemd-devel mailing list