瀏覽代碼

Different way of getting bdsmail address

Bob Mottram 7 年之前
父節點
當前提交
e6ef736b07
共有 1 個檔案被更改,包括 3 行新增2 行删除
  1. 3
    2
      src/freedombone-controlpanel-user

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

@@ -885,14 +885,15 @@ function menu_run_client_app {
885 885
 function show_your_email_address {
886 886
     GPG_FINGERPRINT=$(gpg --fingerprint $GPG_ID | sed -n '2p' | sed 's/^[ \t]*//')
887 887
     GPG_DATE=$(gpg --fingerprint $GPG_ID | grep -i "pub" | head -n 1 | awk -F ' ' '{print $3}')
888
-    if [ ! -d /etc/bdsmail ]; then
888
+    if [ ! -d ~/.mutt/bdsmail ]; then
889 889
         dialog --title $"Show your Email Address" \
890 890
                --backtitle $"Freedombone User Control Panel" \
891 891
                --msgbox $"Email Address: $MY_EMAIL_ADDRESS\n\nKey ID: $GPG_ID\n\nFingerprint: $GPG_FINGERPRINT\n\nCreated: $GPG_DATE" 12 70
892 892
     else
893
+        bdsmail_address=$(cat ~/.mutt/bdsmail | grep 'set from=' | awk -F '=' '{print $2}')
893 894
         dialog --title $"Show your Email Address" \
894 895
                --backtitle $"Freedombone User Control Panel" \
895
-               --msgbox $"\nYou can press SHIFT and then drag the mouse and right click to copy.\n\nEmail Address: $MY_EMAIL_ADDRESS\n\nKey ID: $GPG_ID\n\nFingerprint: $GPG_FINGERPRINT\n\nCreated: $GPG_DATE\n\nI2P Address: ${USER}@$(bdsmail_domain)" 17 90
896
+               --msgbox $"\nYou can press SHIFT and then drag the mouse and right click to copy.\n\nEmail Address: $MY_EMAIL_ADDRESS\n\nKey ID: $GPG_ID\n\nFingerprint: $GPG_FINGERPRINT\n\nCreated: $GPG_DATE\n\nI2P Address: ${USER}@${bdsmail_address{" 17 90
896 897
     fi
897 898
 }
898 899