From: Daniel Hahler <github@thequod.de>
Date: Tue, 16 Aug 2016 16:47:39 +0000 (+0200)
Subject: zsh: _journalctl: also handle --root arg and --key=value style (#3956)
X-Git-Tag: v232~296
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2fe35fe58f5229c0a265c86877b5d08114a2867;p=thirdparty%2Fsystemd.git

zsh: _journalctl: also handle --root arg and --key=value style (#3956)

This will now also handle `journalctl --directory=/var/log/journal`
properly.
---

diff --git a/shell-completion/zsh/_journalctl b/shell-completion/zsh/_journalctl
index 610788dcce9..ef67fcf2a0d 100644
--- a/shell-completion/zsh/_journalctl
+++ b/shell-completion/zsh/_journalctl
@@ -54,16 +54,25 @@ _journal_boots() {
 # Build arguments for "journalctl" to be used in completion.
 # Use both --user and --system modes, they are not exclusive.
 local -a _modes; _modes=(--user --system)
-local -a _modes_with_arg; _modes_with_arg=(--directory -D --file -M --machine)
+local -a _modes_with_arg; _modes_with_arg=(--directory -D --file -M --machine --root)
 typeset -a _sys_service_mgr
-local w i=0 n=$#words
+local w k v i=0 n=$#words
 while (( i++ < n )); do
     w=$words[$i]
     if (( $_modes[(I)$w] )); then
         _sys_service_mgr+=($w)
     else
-        if (( ${_modes_with_arg[(I)$w]} )); then
-            _sys_service_mgr+=($w ${words[((++i))]})
+        # Handle options with arguments. "--key=value" and "--key value".
+        k=${w%%=*}
+        if (( ${_modes_with_arg[(I)$k]} )); then
+            v=${w#*=}
+            if [[ "$k" != "$w" ]]; then
+                # "--key=value" style.
+                _sys_service_mgr+=($w)
+            else
+                # "--key value" style.
+                _sys_service_mgr+=($w ${words[((++i))]})
+            fi
         fi
     fi
 done