Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-11-22 12:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

improved gpg recipient output warning

Browse Source 
dropped the dependency from grep, head, cut, sed (only using awk)
added human readeable GPG ID besides fingerprint on recipient check
This commit is contained in:
Jaromil 2019-05-05 11:29:25 +02:00
parent eec64f4f65
commit ec31d2d280
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tomb
View File

@ -988,10 +988,12 @@ _recipients_arg() {
# $1 is a GPG key recipient # $1 is a GPG key recipient
# Print the fingerprint of the GPG key # Print the fingerprint of the GPG key
_fingerprint() { _gpg_fingerprint() {
local recipient="$1" gpg --with-colons --fingerprint "$1" |
gpg --with-colons --fingerprint "$recipient" | grep fpr | head -1 | cut -d ':' -f 10 | sed 's/.\{4\}/& /g' awk 'BEGIN { FS=":" } /^fpr/ { print $10; exit }' }
} _gpg_uid() {
gpg --with-colons --list-key "$1" |
awk 'BEGIN { FS=":" } /^uid/ { print $10; exit}' }
# $1 is the encrypted key contents we are checking # $1 is the encrypted key contents we are checking
@ -1395,7 +1397,7 @@ gen_key() {
_warning "It is your responsibility to check these fingerprints." _warning "It is your responsibility to check these fingerprints."
_warning "The fingerprints are:" _warning "The fingerprints are:"
for gpg_id in ${recipients[@]}; do for gpg_id in ${recipients[@]}; do
_warning " `_fingerprint "$gpg_id"` ($gpg_id)" _warning " `_gpg_fingerprint "$gpg_id"` :: `_gpg_uid "$gpg_id"`"
done done
gpgopt+=(`_recipients_arg "$recipients_opt" $recipients`) gpgopt+=(`_recipients_arg "$recipients_opt" $recipients`)