X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=shell-completion%2Fbash%2Fbusctl;h=49520e48d2b2732a7f9b29b9e0ede4e3637c940b;hp=0727241460dce63fefb395cff336c95cdcee1135;hb=9700d6980f7c212b10a69399e6430b82a6f45587;hpb=8ec76163fff0a5f6aa31bb6061199829f4cfd75d

diff --git a/shell-completion/bash/busctl b/shell-completion/bash/busctl
index 072724146..49520e48d 100644
--- a/shell-completion/bash/busctl
+++ b/shell-completion/bash/busctl
@@ -31,19 +31,26 @@ __get_machines() {
 }
 
 __get_endpoints() {
+        local mode=$1
         local a b
-        busctl list --no-pager | { while read a b; do echo " $a"; done; };
+        busctl $mode list --no-legend --no-pager | { while read a b; do echo " $a"; done; };
 }
 
 _busctl() {
-        local i verb comps
+        local i verb comps mode
         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
         local -A OPTS=(
-               [STANDALONE]='-h --help --version --no-pager --system --user
+               [STANDALONE]='-h --help --version --no-pager --no-legend --system --user
                              --show-machine --unique --acquired --activatable'
                       [ARG]='-H --host -M --machine --address --match'
         )
 
+        if __contains_word "--user" ${COMP_WORDS[*]}; then
+            mode=--user
+        else
+            mode=--system
+        fi
+
         if __contains_word "$prev" ${OPTS[ARG]}; then
                 case $prev in
                         --host|-H)
@@ -79,7 +86,7 @@ _busctl() {
         elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
                 comps=''
         elif __contains_word "$verb" ${VERBS[ENDPOINT]}; then
-                comps=$( __get_endpoints )
+                comps=$( __get_endpoints $mode)
         fi
 
         COMPREPLY=( $(compgen -W '$comps' -- "$cur") )