summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-10-20 18:36:06 -0400
committerDave Reisner <dreisner@archlinux.org>2012-10-20 18:38:28 -0400
commit0dd17959075e9ffe1e851c75fcc6a162d225feea (patch)
treef030440766a1db9db3231f5af863ac2975021de5
parenta632a03076dd254bd967011b68d91b131ce88606 (diff)
bash-completion: avoid appending space after field competion
Resolves the TODO, and also uses compgen's -S flag to append the trailing equals, rather than relying on an array-wide parameter expansion. Suggested-by: Ran Benita <ran234@gmail.com>
-rw-r--r--bash-completion/systemd-bash-completion.sh7
1 files changed, 2 insertions, 5 deletions
diff --git a/bash-completion/systemd-bash-completion.sh b/bash-completion/systemd-bash-completion.sh
index a03433269c..82c25a3894 100644
--- a/bash-completion/systemd-bash-completion.sh
+++ b/bash-completion/systemd-bash-completion.sh
@@ -331,11 +331,8 @@ _journalctl() {
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
- # append an extra space after the completed word, if such an
- # option exists.
- COMPREPLY=( $(compgen -W '${journal_fields[*]/%/=}' -- "$cur") )
+ compopt -o nospace
+ COMPREPLY=( $(compgen -W '${journal_fields[*]}' -S= -- "$cur") )
fi
}
complete -F _journalctl journalctl