picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #12089 from mrc0mmand/journalctl-bash-comp-redirection

Browse source 
bash-completion: use the default completion for shell redirect operators
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-03-25 14:22:15 +01:00 committed by GitHub
parent b82f71c7ff c01dbf6d19
commit 3e7c973f1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
shell-completion/bash/journalctl
View file

@ -28,7 +28,7 @@ __contains_word () {
__get_machines() {
local a b
(machinectl list-images --no-legend --no-pager; machinectl list --no-legend --no-pager; echo ".host") | \
{ while read a b; do echo " $a"; done; } | sort -u;
{ while read a b; do echo " $a"; done; } | sort -u;
}
__syslog_priorities=(emerg alert crit err warning notice info debug)
@ -52,6 +52,13 @@ _journalctl() {
--vacuum-size --vacuum-time --vacuum-files --output-fields'
)
# Use the default completion for shell redirect operators
if __contains_word "$prev" '>' '>>' '&>'; then
compopt -o filenames
COMPREPLY=( $(compgen -f -- "$cur") )
return 0;
fi
if __contains_word "$prev" ${OPTS[ARG]} ${OPTS[ARGUNKNOWN]}; then
case $prev in
--boot|-b)
@ -70,7 +77,7 @@ _journalctl() {
;;
--field|-F)
comps=$(journalctl --fields | sort 2>/dev/null)
;;
;;
--machine|-M)
comps=$( __get_machines )
;;