summaryrefslogtreecommitdiff
path: root/bash-completion
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-10-18 17:38:05 -0400
committerDave Reisner <dreisner@archlinux.org>2012-10-18 17:44:59 -0400
commitad57912eb0ec7d4fabd6a8d4267baa669bd04bb2 (patch)
treeabe4c2f7d1014682047f2b803a8e688af92aca61 /bash-completion
parentf89a3b6f5bf695186e7b9e6cc63993b1272e7569 (diff)
bash-completion: complete values for journal fields
This adds completion for the new -F, --field flag, but also uses this option directly from journalctl to complete values for fields which might be used as filters.
Diffstat (limited to 'bash-completion')
-rw-r--r--bash-completion/systemd-bash-completion.sh13
1 files changed, 11 insertions, 2 deletions
diff --git a/bash-completion/systemd-bash-completion.sh b/bash-completion/systemd-bash-completion.sh
index db5636b8c5..8bb7e8dad3 100644
--- a/bash-completion/systemd-bash-completion.sh
+++ b/bash-completion/systemd-bash-completion.sh
@@ -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