[systemd-devel] [PATCH 3/3] shell-completion: Add new journalctl options

[William Giokas]

New options:

* -e, --pager-end
* -r, --reverse
* -x, --catalog
* -k, --dmesg
* --after-cursor
* --file
* --root
* --dump-catalog
* --force

Modified options:

* --this-boot -> --boot=

Also reorganized the options to match the manual page, similar to
systemctl.
---
 shell-completion/systemd-zsh-completion.zsh | 47 +++++++++++++++++------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/shell-completion/systemd-zsh-completion.zsh b/shell-completion/systemd-zsh-completion.zsh
index e26bba2..4b699cc 100644
--- a/shell-completion/systemd-zsh-completion.zsh
+++ b/shell-completion/systemd-zsh-completion.zsh
@@ -73,37 +73,46 @@ _ctls()
         ;;
         journalctl)
             _arguments -s \
-                '--since=[Start showing entries newer or of the specified date]:YYYY-MM-DD HH\:MM\:SS' \
-                '--until=[Stop showing entries older or of the specified date]:YYYY-MM-DD HH\:MM\:SS' \
-                {-c,--cursor=}'[Start showing entries from specified cursor]:cursors:_journal_fields __CURSORS' \
-                '--system[Show system and kernel messages]' \
-                '--user[Show messages from user services]' \
-                {-b,--this-boot}'[Show data only from current boot]' \
-                {-u,--unit=}'[Show data only from the specified unit]:units:_journal_fields _SYSTEMD_UNIT' \
-                '--user-unit[Show data only from the specified user session unit]:units:_journal_fields _SYSTEMD_USER_UNIT' \
-                {-p,--priority=}'[Show only messages within the specified priority range]:priority:_journal_fields PRIORITY' \
+                {-h,--help}'[Show this help]' \
+                '--version[Show package version]' \
+                '--no-pager[Do not pipe output into a pager]' \
+                {-l,--full}'[Show long fields in full]' \
+                {-a,--all}'[Show all fields, including long and unprintable]' \
                 {-f,--follow}'[Follow journal]' \
+                {-e,--pager-end}'[Jump to the end of the journal in the pager]' \
                 {-n,--lines=}'[Number of journal entries to show]:integer' \
                 '--no-tail[Show all lines, even in follow mode]' \
+                {-r,--reverse}'[Reverse output]' \
                 {-o,--output=}'[Change journal output mode]:output modes:_outputmodes' \
-                {-l,--full}'[Show long fields in full]' \
-                {-a,--all}'[Show all fields, including long and unprintable]' \
+                {-x,--catalog}'[Show explanatory texts with each log line]' \
                 {-q,--quiet}"[Don't show privilege warning]" \
-                '--no-pager[Do not pipe output into a pager]' \
                 {-m,--merge}'[Show entries from all available journals]' \
+                {-b,--boot=}'[Show data only from the specified boot]:boot id or offset' \
+                {-k,--dmesg}'[Show only kernel messages, Implies -b]' \
+                {-u,--unit=}'[Show data only from the specified unit]:units:_journal_fields _SYSTEMD_UNIT' \
+                '--user-unit[Show data only from the specified user session unit]:units:_journal_fields _SYSTEMD_USER_UNIT' \
+                {-p,--priority=}'[Show only messages within the specified priority range]:priority:_journal_fields PRIORITY' \
+                {-c,--cursor=}'[Start showing entries from specified cursor]:cursors:_journal_fields __CURSORS' \
+                '--after-cursor=[Start showing entries from the location in the journal after the cursor]:cursors:_journal_fields __CURSORS' \
+                '--since=[Start showing entries newer or of the specified date]:YYYY-MM-DD HH\:MM\:SS' \
+                '--until=[Stop showing entries older or of the specified date]:YYYY-MM-DD HH\:MM\:SS' \
+                {-F,--field=}'[List all values a certain field takes]:Fields:_list_fields' \
+                '--system[Show system and kernel messages]' \
+                '--user[Show messages from user services]' \
                 {-D,--directory=}'[Show journal files from directory]:directories:_directories' \
-                '--interval=[Time interval for changing the FSS sealing key]:time interval' \
-                '--verify-key=[Specify FSS verification key]:FSS key' \
-                {-h,--help}'[Show this help]' \
-                '--version[Show package version]' \
+                '--file=[Operate on specified journal files]:file:_files' \
+                '--root=[Operate on catalog hierarchy under specified directory]:directories:_directories' \
                 '--new-id128[Generate a new 128 Bit ID]' \
                 '--header[Show journal header information]' \
                 '--disk-usage[Show total disk usage]' \
-                {-F,--field=}'[List all values a certain field takes]:Fields:_list_fields' \
-                '--setup-keys[Generate new FSS key pair]' \
-                '--verify[Verify journal file consistency]' \
                 '--list-catalog[List messages in catalog]' \
+                '--dump-catalog[Dump messages in catalog]' \
                 '--update-catalog[Update binary catalog database]' \
+                '--setup-keys[Generate new FSS key pair]' \
+                '--force[Force recreation of FSS keys]' \
+                '--interval=[Time interval for changing the FSS sealing key]:time interval' \
+                '--verify[Verify journal file consistency]' \
+                '--verify-key=[Specify FSS verification key]:FSS key' \
                 '*::default: _journal_none'
         ;;
         localectl)
-- 
1.8.3.2.1052.g3a6d627