From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 17 Dec 2018 05:44:38 +0000 (+0900)
Subject: bash-completion: also suggests device units
X-Git-Tag: v240~43^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F11180%2Fhead;p=thirdparty%2Fsystemd.git

bash-completion: also suggests device units

Follow-up for b6854081ffb26c32a8d1440346f9ee5b9d2f1e57.
---

diff --git a/shell-completion/bash/udevadm b/shell-completion/bash/udevadm
index 1789454d8a9..7b33839b1e9 100644
--- a/shell-completion/bash/udevadm
+++ b/shell-completion/bash/udevadm
@@ -37,6 +37,11 @@ __get_all_devs() {
         done
 }
 
+__get_all_device_units() {
+        systemctl list-units -t device --full --no-legend --no-pager 2>/dev/null | \
+                { while read -r a b; do echo "$a"; done; }
+}
+
 _udevadm() {
         local i verb comps builtin
         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
@@ -101,8 +106,8 @@ _udevadm() {
                         if [[ $cur = -* ]]; then
                                 comps="${OPTS[COMMON]} ${OPTS[INFO_STANDALONE]} ${OPTS[INFO_ARG]}"
                         else
+                                comps=$( __get_all_sysdevs; __get_all_device_units )
                                 local IFS=$'\n'
-                                comps=$( __get_all_sysdevs )
                         fi
                         ;;
                 'trigger')
@@ -132,8 +137,8 @@ _udevadm() {
                         if [[ $cur = -* ]]; then
                                 comps="${OPTS[COMMON]} ${OPTS[TRIGGER_STANDALONE]} ${OPTS[TRIGGER_ARG]}"
                         else
+                                comps=$( __get_all_sysdevs; __get_all_device_units )
                                 local IFS=$'\n'
-                                comps=$( __get_all_sysdevs )
                         fi
                         ;;
                 'settle')