浏览代码

Display gpg fingerprint on control panel

Bob Mottram 8 年前
父节点
当前提交
8990025c26
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2
    2
      src/freedombone-controlpanel-user

+ 2
- 2
src/freedombone-controlpanel-user 查看文件

@@ -398,8 +398,8 @@ function block_unblock_subject {
398 398
 }
399 399
 
400 400
 function show_gpg_key {
401
-    GPG_FINGERPRINT=$(gpg --fingerprint $MY_EMAIL_ADDRESS | grep -i "key fingerprint" | head -n 1 | awk -F '= ' '{print $2}')
402
-    GPG_DATE=$(gpg --fingerprint $MY_EMAIL_ADDRESS | grep -i "pub" | head -n 1 | awk -F '/' '{print $2}' | awk -F ' ' '{print $2}')
401
+    GPG_FINGERPRINT=$(gpg --fingerprint $MY_EMAIL_ADDRESS | sed -n '2p' | sed 's/^[ \t]*//')
402
+    GPG_DATE=$(gpg --fingerprint $MY_EMAIL_ADDRESS | grep -i "pub" | head -n 1 | awk -F ' ' '{print $3}')
403 403
     dialog --title $"My PGP/GPG Key" \
404 404
            --backtitle $"Freedombone User Control Panel" \
405 405
            --msgbox $"Email Address: $MY_EMAIL_ADDRESS\n\nKey ID: $GPG_ID\n\nFingerprint: $GPG_FINGERPRINT\n\nCreated: $GPG_DATE" 12 70