From e6ef736b07aa7ee08d4901cbaad7c5f38a0b0a1d Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 15 Feb 2018 18:50:20 +0000 Subject: [PATCH] Different way of getting bdsmail address --- src/freedombone-controlpanel-user | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/freedombone-controlpanel-user b/src/freedombone-controlpanel-user index 4dd58a70..553a1980 100755 --- a/src/freedombone-controlpanel-user +++ b/src/freedombone-controlpanel-user @@ -885,14 +885,15 @@ function menu_run_client_app { function show_your_email_address { GPG_FINGERPRINT=$(gpg --fingerprint $GPG_ID | sed -n '2p' | sed 's/^[ \t]*//') GPG_DATE=$(gpg --fingerprint $GPG_ID | grep -i "pub" | head -n 1 | awk -F ' ' '{print $3}') - if [ ! -d /etc/bdsmail ]; then + if [ ! -d ~/.mutt/bdsmail ]; then dialog --title $"Show your Email Address" \ --backtitle $"Freedombone User Control Panel" \ --msgbox $"Email Address: $MY_EMAIL_ADDRESS\n\nKey ID: $GPG_ID\n\nFingerprint: $GPG_FINGERPRINT\n\nCreated: $GPG_DATE" 12 70 else + bdsmail_address=$(cat ~/.mutt/bdsmail | grep 'set from=' | awk -F '=' '{print $2}') dialog --title $"Show your Email Address" \ --backtitle $"Freedombone User Control Panel" \ - --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 + --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 fi }