X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=bash-completion%2Fsystemd-bash-completion.sh;h=8bb7e8dad36e84cadd605b22b6b044e1976c4515;hb=3bb9434b69b8562117b8ec34b4498aa208907316;hp=39ef165f3bb7fb14cfdf8787e821f1e767e2becc;hpb=3d3e4405ba65d65976453c567c31ff5350030e43;p=elogind.git

diff --git a/bash-completion/systemd-bash-completion.sh b/bash-completion/systemd-bash-completion.sh
index 39ef165f3..8bb7e8dad 100644
--- a/bash-completion/systemd-bash-completion.sh
+++ b/bash-completion/systemd-bash-completion.sh
@@ -143,16 +143,16 @@ _systemctl () {
         elif __contains_word "$verb" ${VERBS[STARTABLE_UNITS]}; then
                 comps=$( __filter_units_by_property CanStart yes \
                       $( __get_inactive_units \
-		        | while read -r line; do \
-		                [[ "$line" =~ \.(device|snapshot)$ ]] || printf "%s\n" "$line"; \
-		        done ))
+                        | while read -r line; do \
+                                [[ "$line" =~ \.(device|snapshot)$ ]] || printf "%s\n" "$line"; \
+                        done ))
 
         elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then
                 comps=$( __filter_units_by_property CanStart yes \
                       $( __get_all_units \
-		        | while read -r line; do \
-		                [[ "$line" =~ \.(device|snapshot|socket|timer)$ ]] || printf "%s\n" "$line"; \
-		        done ))
+                        | while read -r line; do \
+                                [[ "$line" =~ \.(device|snapshot|socket|timer)$ ]] || printf "%s\n" "$line"; \
+                        done ))
 
         elif __contains_word "$verb" ${VERBS[STOPPABLE_UNITS]}; then
                 comps=$( __filter_units_by_property CanStop yes \
@@ -281,12 +281,12 @@ _loginctl () {
 complete -F _loginctl loginctl
 
 _journalctl() {
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+        local field_vals= cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
         local -A OPTS=(
                 [STANDALONE]='-a --all -b --this-boot -f --follow --header
                               -h --help -l --local --new-id128 --no-pager
                               --no-tail -q --quiet --setup-keys --verify --version'
-                [ARG]='-D --directory --interval -n --lines -o --output
+                [ARG]='-D --directory -F --field --interval -n --lines -o --output
                        -p --priority --verify-key'
         )
         local journal_fields=(MESSAGE{,_ID} PRIORITY CODE_{FILE,LINE,FUNC}
@@ -310,6 +310,9 @@ _journalctl() {
                         --output|-o)
                                 comps='short short-monotonic verbose export json cat'
                         ;;
+                        --field|-F)
+                                comps=${journal_fields[*]}
+                        ;;
                         *)
                                 return 0
                         ;;
@@ -321,6 +324,12 @@ _journalctl() {
         if [[ $cur = -* ]]; then
                 COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
                 return 0
+        elif [[ $cur = *=* ]]; then
+                mapfile -t field_vals < <(journalctl -F "${prev%=}" 2>/dev/null)
+                COMPREPLY=( $(compgen -W '${field_vals[*]}' -- "${cur#=}") )
+        elif [[ $prev = '=' ]]; then
+                mapfile -t field_vals < <(journalctl -F "${COMP_WORDS[COMP_CWORD-2]}" 2>/dev/null)
+                COMPREPLY=( $(compgen -W '${field_vals[*]}' -- "$cur") )
         else
                 # append an '=' to the end of the completed field
                 # TODO: would be nice to be able to tell readline here not to