diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_gpg | 62 |
2 files changed, 60 insertions, 7 deletions
@@ -1,3 +1,8 @@ +2018-07-01 Doron Behar <doron.behar@gmail.com> + + * 43059: Completion/Unix/Command/_gpg: Use explicit UIDs for + state = public keys. + 2018-07-01 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> * 43107: Completion/Unix/Type/_ttys, Completion/Unix/Command/_ps, diff --git a/Completion/Unix/Command/_gpg b/Completion/Unix/Command/_gpg index 48a36eff2..b35693d1f 100644 --- a/Completion/Unix/Command/_gpg +++ b/Completion/Unix/Command/_gpg @@ -206,20 +206,68 @@ 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_lines=(${(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 j parts current_uid + for (( i = 1; i < ${#public_keys_lines[@]}; ++i )); do + parts=("${(@s.:.)public_keys_lines[$i]}") + if [[ ${parts[1]} == "fpr" ]]; then + current_uid="${parts[10]}" + i=$((i + 1)) + parts=("${(@s.:.)public_keys_lines[$i]}") + while [[ ${parts[1]} == "uid" ]]; do + uids+=("${current_uid}") + emails+=("${parts[10]}") + i=$((i + 1)) + parts=("${(@s.:.)public_keys_lines[$i]}") + done + 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_lines=(${(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 j parts current_uid + for (( i = 1; i < ${#secret_keys_lines[@]}; ++i )); do + parts=("${(@s.:.)secret_keys_lines[$i]}") + if [[ ${parts[1]} == "fpr" ]]; then + current_uid="${parts[10]}" + i=$((i + 1)) + parts=("${(@s.:.)secret_keys_lines[$i]}") + while [[ ${parts[1]} == "uid" ]]; do + uids+=("${current_uid}") + emails+=("${parts[10]}") + i=$((i + 1)) + parts=("${(@s.:.)secret_keys_lines[$i]}") + done + fi + done + _describe -t secret-keys 'secret key' emails uids ;; 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_lines=(${(f)"$(_call_program public-keyids ${(q)words[1]} ${(q)needed} --list-public-keys --list-options no-show-photos --with-colons)"}) + local -a uids emails + local i j parts current_uid + for (( i = 1; i < ${#public_keys_lines[@]}; ++i )); do + parts=("${(@s.:.)public_keys_lines[$i]}") + if [[ ${parts[1]} == "fpr" ]]; then + current_uid="${parts[10]}" + i=$((i + 1)) + parts=("${(@s.:.)public_keys_lines[$i]}") + while [[ ${parts[1]} == "uid" ]]; do + uids+=("${current_uid}") + emails+=("${parts[10]}") + i=$((i + 1)) + parts=("${(@s.:.)public_keys_lines[$i]}") + done + fi + done + _describe -t public-keyids 'public key' emails uids ;; (option-list) _sequence _wanted options expl option \ |