X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=bash-completion%2Fsystemd-bash-completion.sh;h=db5636b8c53f78dd23d0dd18497b9fa52501ff47;hb=0820a4f0f6d6c264339a501a4352c22af26c5300;hp=e60a4863a2885eddd86331dc4b68f7ab673625f0;hpb=f3b17661550da58231139e6aa37848172a385fd2;p=elogind.git

diff --git a/bash-completion/systemd-bash-completion.sh b/bash-completion/systemd-bash-completion.sh
index e60a4863a..db5636b8c 100644
--- a/bash-completion/systemd-bash-completion.sh
+++ b/bash-completion/systemd-bash-completion.sh
@@ -33,25 +33,25 @@ __filter_units_by_property () {
             <(__systemctl show --property "$property" -- "${units[@]}")
         for ((i=0; $i < ${#units[*]}; i++)); do
                 if [[ "${props[i]}" = "$property=$value" ]]; then
-                        echo "${units[i]}"
+                        printf "%s\n" "${units[i]}"
                 fi
         done
 }
 
 __get_all_units      () { __systemctl list-units --all \
-        | { while read -r a b; do echo "$a"; done; }; }
+        | { while read -r a b; do printf "%s\n" "$a"; done; }; }
 __get_active_units   () { __systemctl list-units       \
-        | { while read -r a b; do echo "$a"; done; }; }
+        | { while read -r a b; do printf "%s\n" "$a"; done; }; }
 __get_inactive_units () { __systemctl list-units --all \
-        | { while read -r a b c d; do [[ $c == "inactive" ]] && echo "$a"; done; }; }
+        | { while read -r a b c d; do [[ $c == "inactive" ]] && printf "%s\n" "$a"; done; }; }
 __get_failed_units   () { __systemctl list-units       \
-        | { while read -r a b c d; do [[ $c == "failed"   ]] && echo "$a"; done; }; }
+        | { while read -r a b c d; do [[ $c == "failed"   ]] && printf "%s\n" "$a"; done; }; }
 __get_enabled_units  () { __systemctl list-unit-files  \
-        | { while read -r a b c  ; do [[ $b == "enabled"  ]] && echo "$a"; done; }; }
+        | { while read -r a b c  ; do [[ $b == "enabled"  ]] && printf "%s\n" "$a"; done; }; }
 __get_disabled_units () { __systemctl list-unit-files  \
-        | { while read -r a b c  ; do [[ $b == "disabled" ]] && echo "$a"; done; }; }
+        | { while read -r a b c  ; do [[ $b == "disabled" ]] && printf "%s\n" "$a"; done; }; }
 __get_masked_units   () { __systemctl list-unit-files  \
-        | { while read -r a b c  ; do [[ $b == "masked"   ]] && echo "$a"; done; }; }
+        | { while read -r a b c  ; do [[ $b == "masked"   ]] && printf "%s\n" "$a"; done; }; }
 
 _systemctl () {
         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
@@ -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)$ ]] || echo "$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)$ ]] || echo "$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 \
@@ -176,15 +176,15 @@ _systemctl () {
                 comps=''
 
         elif __contains_word "$verb" ${VERBS[JOBS]}; then
-                comps=$( __systemctl list-jobs | { while read -r a b; do echo "$a"; done; } )
+                comps=$( __systemctl list-jobs | { while read -r a b; do printf "%s\n" "$a"; done; } )
 
         elif __contains_word "$verb" ${VERBS[SNAPSHOTS]}; then
                 comps=$( __systemctl list-units --type snapshot --full --all \
-                        | { while read -r a b; do echo "$a"; done; } )
+                        | { while read -r a b; do printf "%s\n" "$a"; done; } )
 
         elif __contains_word "$verb" ${VERBS[ENVS]}; then
                 comps=$( __systemctl show-environment \
-                    | while read -r line; do echo "${line%%=*}=";done )
+                    | while read -r line; do printf "%s\n" "${line%%=*}=";done )
                 compopt -o nospace
 
         elif __contains_word "$verb" ${VERBS[FILE]}; then
@@ -197,9 +197,9 @@ _systemctl () {
 }
 complete -F _systemctl systemctl
 
-__get_all_sessions () { systemd-loginctl list-sessions | { while read -r a b; do echo "$a"; done; } ; }
-__get_all_users    () { systemd-loginctl list-users    | { while read -r a b; do echo "$b"; done; } ; }
-__get_all_seats    () { systemd-loginctl list-seats    | { while read -r a b; do echo "$a"; done; } ; }
+__get_all_sessions () { loginctl list-sessions | { while read -r a b; do printf "%s\n" "$a"; done; } ; }
+__get_all_users    () { loginctl list-users    | { while read -r a b; do printf "%s\n" "$b"; done; } ; }
+__get_all_seats    () { loginctl list-seats    | { while read -r a b; do printf "%s\n" "$a"; done; } ; }
 
 _loginctl () {
         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
@@ -279,3 +279,54 @@ _loginctl () {
         return 0
 }
 complete -F _loginctl loginctl
+
+_journalctl() {
+        local 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
+                       -p --priority --verify-key'
+        )
+        local journal_fields=(MESSAGE{,_ID} PRIORITY CODE_{FILE,LINE,FUNC}
+                              ERRNO SYSLOG_{FACILITY,IDENTIFIER,PID}
+                              _{P,U,G}ID _COMM _EXE _CMDLINE
+                              _AUDIT_{SESSION,LOGINUID}
+                              _SYSTEMD_{CGROUP,SESSION,UNIT,OWNER_UID}
+                              _SELINUX_CONTEXT _SOURCE_REALTIME_TIMESTAMP
+                              _{BOOT,MACHINE}_ID _HOSTNAME _TRANSPORT
+                              _KERNEL_{DEVICE,SUBSYSTEM}
+                              _UDEV_{SYSNAME,DEVNODE,DEVLINK}
+                              __CURSOR __{REALTIME,MONOTONIC}_TIMESTAMP)
+
+
+        if __contains_word "$prev" ${OPTS[ARG]}; then
+                case $prev in
+                        --directory|-D|--verify-key)
+                                comps=$(compgen -A file -- "$cur")
+                                compopt -o filenames
+                        ;;
+                        --output|-o)
+                                comps='short short-monotonic verbose export json cat'
+                        ;;
+                        *)
+                                return 0
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+                return 0
+        fi
+
+        if [[ $cur = -* ]]; then
+                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+                return 0
+        else
+                # append an '=' to the end of the completed field
+                # TODO: would be nice to be able to tell readline here not to
+                # append an extra space after the completed word, if such an
+                # option exists.
+                COMPREPLY=( $(compgen -W '${journal_fields[*]/%/=}' -- "$cur") )
+        fi
+}
+complete -F _journalctl journalctl