From c2026f28bdc64c608e9b00e8f7916c82f44ec610 Mon Sep 17 00:00:00 2001

From: Eric Cook <llua@gmx.com>

Date: Sat, 27 Sep 2014 08:48:09 -0400

Subject: [PATCH] shell-completion(zsh): journalctl's -b changes

removed pointless index sort of bootids.

use `compadd -a' to add each array, instead of expanding possibly hundreds of words needlessly.

optional completion of -b

---

 shell-completion/zsh/_journalctl | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shell-completion/zsh/_journalctl b/shell-completion/zsh/_journalctl

index 0d16a26a6f..a469bbc9a7 100644

--- a/shell-completion/zsh/_journalctl

+++ b/shell-completion/zsh/_journalctl

@@ -41,11 +41,11 @@ _journal_fields() {

 _journal_boots() {

   local -a _bootid _previousboots

-  _bootid=( ${(fao)"$(_call_program bootid "$service -F _BOOT_ID")"}  )

+  _bootid=( ${(f)"$(_call_program bootid "$service -F _BOOT_ID")"}  )

   _previousboots=( -{1..${#_bootid}} )

   _alternative : \

-    "offsets:boot offsets:(${_previousboots[1,-2]})" \

-    "bootid:boot ids:(${_bootid[@]})"

+    "offsets:boot offsets:compadd -a '_previousboots[1,-2]'" \

+    "bootid:boot ids:compadd -a _bootid"

 }

 _arguments -s \

@@ -63,7 +63,7 @@ _arguments -s \

     {-x,--catalog}'[Show explanatory texts with each log line]' \

     {-q,--quiet}"[Don't show privilege warning]" \

     {-m,--merge}'[Show entries from all available journals]' \

-    {-b+,--boot=}'[Show data only from the specified boot or offset]:boot id or offset:_journal_boots' \

+    {-b+,--boot=}'[Show data only from the specified boot or offset]::boot id or offset:_journal_boots' \

     '--list-boots[List boots ordered by time]' \

     {-k,--dmesg}'[Show only kernel messages from the current boot]' \

     {-u+,--unit=}'[Show data only from the specified unit]:units:_journal_fields _SYSTEMD_UNIT' \