systemctl: allow multiple arguments to --type

[elogind.git] / shell-completion / bash / systemctl

diff --git a/shell-completion/bash/systemctl b/shell-completion/bash/systemctl
index ce46d50a917cb9b562c2a78e1d7067f34d7eef69..f24a1454245b8afb2032f1e0fa582ed5796417f8 100644 (file)
--- a/shell-completion/bash/systemctl
+++ b/shell-completion/bash/systemctl
@@ -36,25 +36,25 @@ __filter_units_by_property () {
             <(__systemctl $mode show --property "$property" -- "${units[@]}")
         for ((i=0; $i < ${#units[*]}; i++)); do
                 if [[ "${props[i]}" = "$property=$value" ]]; then
             <(__systemctl $mode show --property "$property" -- "${units[@]}")
         for ((i=0; $i < ${#units[*]}; i++)); do
                 if [[ "${props[i]}" = "$property=$value" ]]; then

-                        printf "%s\n" "${units[i]}"
+                        echo " ${units[i]}"

                 fi
         done
 }
 
 __get_all_units      () { __systemctl $1 list-units --all \
                 fi
         done
 }
 
 __get_all_units      () { __systemctl $1 list-units --all \

-        | { while read -r a b; do printf "%s\n" "$a"; done; }; }
+        | { while read -r a b; do echo " $a"; done; }; }

 __get_active_units   () { __systemctl $1 list-units       \
 __get_active_units   () { __systemctl $1 list-units       \

-        | { while read -r a b; do printf "%s\n" "$a"; done; }; }
-__get_inactive_units () { __systemctl $1 list-units --all \
-        | { while read -r a b c d; do [[ $c == "inactive" ]] && printf "%s\n" "$a"; done; }; }
+        | { while read -r a b; do echo " $a"; done; }; }
+__get_startable_units () { __systemctl $1 list-units --all -t service,timer,socket,mount,automount,path,snapshot,swap \
+        | { while read -r a b c d; do [[ $c == "inactive" || $c == "failed " ]] && echo " $a"; done; }; }

 __get_failed_units   () { __systemctl $1 list-units       \
 __get_failed_units   () { __systemctl $1 list-units       \

-        | { while read -r a b c d; do [[ $c == "failed"   ]] && printf "%s\n" "$a"; done; }; }
+        | { 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  \

-        | { while read -r a b c  ; do [[ $b == "enabled"  ]] && printf "%s\n" "$a"; done; }; }
+        | { 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  \

-        | { while read -r a b c  ; do [[ $b == "disabled" ]] && printf "%s\n" "$a"; done; }; }
+        | { 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  \

-        | { while read -r a b c  ; do [[ $b == "masked"   ]] && printf "%s\n" "$a"; done; }; }
+        | { while read -r a b c  ; do [[ $b == "masked"   ]] && echo " $a"; done; }; }

 
 _systemctl () {
         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
 
 _systemctl () {
         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}


@@ -109,8 +109,9 @@ _systemctl () {
 
         local -A VERBS=(
                 [ALL_UNITS]='is-active is-failed is-enabled status show mask preset'
 
         local -A VERBS=(
                 [ALL_UNITS]='is-active is-failed is-enabled status show mask preset'

-            [ENABLED_UNITS]='disable reenable'
+            [ENABLED_UNITS]='disable'

            [DISABLED_UNITS]='enable'
            [DISABLED_UNITS]='enable'

+        [REENABLABLE_UNITS]='reenable'

              [FAILED_UNITS]='reset-failed'
           [STARTABLE_UNITS]='start'
           [STOPPABLE_UNITS]='stop condstop kill try-restart condrestart'
              [FAILED_UNITS]='reset-failed'
           [STARTABLE_UNITS]='start'
           [STOPPABLE_UNITS]='stop condstop kill try-restart condrestart'


@@ -149,18 +150,19 @@ _systemctl () {
         elif __contains_word "$verb" ${VERBS[DISABLED_UNITS]}; then
                 comps=$( __get_disabled_units $mode )
 
         elif __contains_word "$verb" ${VERBS[DISABLED_UNITS]}; then
                 comps=$( __get_disabled_units $mode )
 

+        elif __contains_word "$verb" ${VERBS[REENABLABLE_UNITS]}; then
+                comps=$( __get_disabled_units $mode;
+                         __get_enabled_units $mode )
+

         elif __contains_word "$verb" ${VERBS[STARTABLE_UNITS]}; then
                 comps=$( __filter_units_by_property $mode CanStart yes \
         elif __contains_word "$verb" ${VERBS[STARTABLE_UNITS]}; then
                 comps=$( __filter_units_by_property $mode CanStart yes \

-                      $( __get_inactive_units $mode \
-                        | while read -r line; do \
-                                [[ "$line" =~ \.(device|snapshot)$ ]] || printf "%s\n" "$line"; \
-                        done ))
+                      $( __get_startable_units $mode))

 
         elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then
                 comps=$( __filter_units_by_property $mode CanStart yes \
                       $( __get_all_units $mode \
                         | while read -r line; do \
 
         elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then
                 comps=$( __filter_units_by_property $mode CanStart yes \
                       $( __get_all_units $mode \
                         | while read -r line; do \

-                                [[ "$line" =~ \.(device|snapshot|socket|timer)$ ]] || printf "%s\n" "$line"; \
+                                [[ "$line" =~ \.(device|snapshot|socket|timer)$ ]] || echo " $line"; \

                         done ))
 
         elif __contains_word "$verb" ${VERBS[STOPPABLE_UNITS]}; then
                         done ))
 
         elif __contains_word "$verb" ${VERBS[STOPPABLE_UNITS]}; then


@@ -185,15 +187,15 @@ _systemctl () {
                 comps=''
 
         elif __contains_word "$verb" ${VERBS[JOBS]}; then
                 comps=''
 
         elif __contains_word "$verb" ${VERBS[JOBS]}; then

-                comps=$( __systemctl $mode list-jobs | { while read -r a b; do printf "%s\n" "$a"; done; } )
+                comps=$( __systemctl $mode list-jobs | { while read -r a b; do echo " $a"; done; } )

 
         elif __contains_word "$verb" ${VERBS[SNAPSHOTS]}; then
                 comps=$( __systemctl $mode list-units --type snapshot --full --all \
 
         elif __contains_word "$verb" ${VERBS[SNAPSHOTS]}; then
                 comps=$( __systemctl $mode list-units --type snapshot --full --all \

-                        | { while read -r a b; do printf "%s\n" "$a"; done; } )
+                        | { while read -r a b; do echo " $a"; done; } )

 
         elif __contains_word "$verb" ${VERBS[ENVS]}; then
                 comps=$( __systemctl $mode show-environment \
 
         elif __contains_word "$verb" ${VERBS[ENVS]}; then
                 comps=$( __systemctl $mode show-environment \

-                    | while read -r line; do printf "%s\n" "${line%%=*}=";done )
+                    | while read -r line; do echo " ${line%%=*}=";done )

                 compopt -o nospace
 
         elif __contains_word "$verb" ${VERBS[FILE]}; then
                 compopt -o nospace
 
         elif __contains_word "$verb" ${VERBS[FILE]}; then