From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 741 invoked by alias); 9 Jun 2018 20:09:32 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 42975 Received: (qmail 21533 invoked by uid 1010); 9 Jun 2018 20:09:32 -0000 X-Qmail-Scanner-Diagnostics: from mail-wr0-f196.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(209.85.128.196):SA:0(-2.7/5.0):. Processed in 3.668188 secs); 09 Jun 2018 20:09:32 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_PASS,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1 X-Envelope-From: doron.behar@gmail.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=bb3Nv2l3ZvmYQe1/vQxfZIrw4GeQTjs9+d2gEB9AT0I=; b=hPi/Nz9ucJZ1mqqpDgaHvshfmDLwz4xK+IlT4pCHxN+S2L4bxYjTkzGa3SQLD8mIf2 bDqxabc9z8zmEUse2SbGtOCo7QUth65d41z8Kj6/NAewFO0Z706WJK0GdUTm4gnho6H/ ku3h/6JdzwxfI8WPpGX482WaUrpbVHSjGOsZlWXNCfwxzF8f5X6Mw1ZEDc49e2v98/i4 BryNL9MDxadT202H0NJQ/qnTHQ52/NWQxHa38ac5KqtoNw4pBovqAecs+Wm7bLd5stZK F45RBxinCE+RiUXilWbaj3wInpP9SC/F3zVRSJWcz3jMg+2dGyR/rVjqtZJr1XgSYytL 0mbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=bb3Nv2l3ZvmYQe1/vQxfZIrw4GeQTjs9+d2gEB9AT0I=; b=e2rybwEtW1IDKsKH7q0/7hqwiT/JarvILz6wOkQHWnbBUfP64PMjsNWUwPC8NIFFQ6 lufDKec9wa3U4tU/HbZEp9FD0/TNCuh5AZvXMHQIkIeB8EfuJXflX/Nqi2BZl6R1z8MZ U+MbuX6ndNNRBoOX0mL7YJ1LSK6nzxxuh7FNH6rHBDd0z87tUF+UZkS9YMe3RtwVkVB7 Qs/LyEg/7s+EPxs1jpSpuu1BNp6rBuYEdDHVUmqVhRquzd84kiBIECoK3EwFhoG0iwZJ PU+W+kOhoEax9NxZgkXyzjMuoi7Px2sMBxcvI54gDjkhb3/zhvPeB2aZGUfi1iWj0vq+ b4rQ== X-Gm-Message-State: APt69E3KCLz4PA0YIRTcNzYmaDhET1lUOoNQRODabp9zyxxfteVoHwz2 L4MbUkY5OuqCvhLYJf5OGlE9g/0v X-Google-Smtp-Source: ADUXVKJ02HdiZO0gYRfy2uB70EgdvdkmRk8XiWEkrIpPuQe2/9cy3FB6HdG6bAmY37b4fTssVE/clw== X-Received: by 2002:a5d:4611:: with SMTP id t17-v6mr2750872wrq.74.1528574964626; Sat, 09 Jun 2018 13:09:24 -0700 (PDT) From: doron.behar@gmail.com To: zsh-workers@zsh.org Subject: [PATCH] _gpg: Use explicit UIDs for public / secret keys. Date: Sat, 9 Jun 2018 23:09:40 +0300 Message-Id: <20180609200940.17041-1-doron.behar@gmail.com> X-Mailer: git-send-email 2.17.1 From: Doron Behar Use the `--with-colons` option and parse the output according to the format. --- Completion/Unix/Command/_gpg | 65 ++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 7 deletions(-) diff --git a/Completion/Unix/Command/_gpg b/Completion/Unix/Command/_gpg index 48a36eff2..c7830bd34 100644 --- a/Completion/Unix/Command/_gpg +++ b/Completion/Unix/Command/_gpg @@ -206,20 +206,71 @@ fi case "$state" in public-keys) - _wanted public-keys expl 'public key' \ - compadd ${${(Mo)$(_call_program public-keys $words[1] $needed --list-public-keys --list-options no-show-photos):%<*>}//(<|>)/} && return + local public_keys=(${(@s.:.)${(f)"$(_call_program public-keys ${(q)words[1]} ${(q)needed} --list-public-keys --list-options no-show-photos --with-colons)"}}) + local -a uids emails + local i + for i in {1..${#public_keys[@]}}; do + if [[ ${public_keys[$i]} == "fpr" ]]; then + i=$((i + 1)) + local j=$i + while [[ ${public_keys[$j]} != "fpr" ]] && [ $j -lt ${#public_keys[@]} ]; do + if [[ ${public_keys[$j]} =~ "@" ]]; then + emails+="${public_keys[$j]}" + uids+="${public_keys[$i]}" + break + fi + j=$((j + 1)) + done + i=$j + fi + done + _describe -t public-keys 'public key' emails uids ;; secret-keys) - _wanted secret-keys expl 'secret key' compadd \ - ${${(Mo)$(_call_program secret-keys $words[1] $needed --list-secret-keys --list-options no-show-photos):%<*>}//(<|>)/} && return + local secret_keys=(${(@s.:.)${(f)"$(_call_program secret-keys ${(q)words[1]} ${(q)needed} --list-secret-keys --list-options no-show-photos --with-colons)"}}) + local -a uids emails + local i + for i in {1..${#secret_keys[@]}}; do + if [[ ${secret_keys[$i]} == "fpr" ]]; then + i=$((i + 1)) + local j=$i + while [[ ${secret_keys[$j]} != "fpr" ]] && [ $j -lt ${#secret_keys[@]} ]; do + if [[ ${secret_keys[$j]} =~ "@" ]]; then + emails+="${secret_keys[$j]}" + uids+="${secret_keys[$i]}" + break + fi + j=$((j + 1)) + done + i=$j + fi + done + _describe -t secret-keys 'secret key' uids_and_emails ;; ciphers) _wanted ciphers expl cipher compadd \ - ${${(s.,.)${(M)${(f)${"$(_call_program ciphers $words[1] $needed --version)"}//,$'\n' #/, }:#Cipher*}#*:}# } && return + ${${(s.,.)${(M)${(f)${"$(_call_program ciphers ${(q)words[1]} ${(q)needed} --version)"}//,$'\n' #/, }:#Cipher*}#*:}# } && return ;; (public-keyids) - _wanted public-keys expl 'public keyid' \ - compadd ${(M)${${(f)"$(_call_program public-keyids $words[1] $needed --list-public-keys --list-options no-show-photos)"}## #}:#[0-9A-F](#c40)} && return + local public_keys=(${(@s.:.)${(f)"$(_call_program public-keys ${(q)words[1]} ${(q)needed} --list-public-keys --list-options no-show-photos --with-colons)"}}) + local -a uids emails + local i + for i in {1..${#public_keys[@]}}; do + if [[ ${public_keys[$i]} == "fpr" ]]; then + i=$((i + 1)) + local j=$i + while [[ ${public_keys[$j]} != "fpr" ]] && [ $j -lt ${#public_keys[@]} ]; do + if [[ ${public_keys[$j]} =~ "@" ]]; then + emails+="${public_keys[$j]}" + uids+="${public_keys[$i]}" + break + fi + j=$((j + 1)) + done + i=$j + fi + done + _describe -t public-keyids 'public keyids' uids_and_emails ;; (option-list) _sequence _wanted options expl option \ -- 2.17.1