|
@@ -4326,6 +4326,24 @@ function folders_for_mailing_lists {
|
4326
|
4326
|
echo 'folders_for_mailing_lists' >> $COMPLETION_FILE
|
4327
|
4327
|
}
|
4328
|
4328
|
|
|
4329
|
+# Ensure that the from field is correct when sending email from Mutt
|
|
4330
|
+function email_from_address {
|
|
4331
|
+ if grep -Fxq "email_from_address" $COMPLETION_FILE; then
|
|
4332
|
+ return
|
|
4333
|
+ fi
|
|
4334
|
+
|
|
4335
|
+ if [ ! -f /home/$MY_USERNAME/.muttrc ]; then
|
|
4336
|
+ return
|
|
4337
|
+ fi
|
|
4338
|
+ if grep -q "set from=" /home/$MY_USERNAME/.muttrc; then
|
|
4339
|
+ sed -i "s|set from=.*|set from='$MY_NAME <$MY_EMAIL_ADDRESS>'|g" /home/$MY_USERNAME/.muttrc
|
|
4340
|
+ else
|
|
4341
|
+ echo "set from='$MY_NAME <$MY_EMAIL_ADDRESS>'" >> /home/$MY_USERNAME/.muttrc
|
|
4342
|
+ fi
|
|
4343
|
+
|
|
4344
|
+ echo 'email_from_address' >> $COMPLETION_FILE
|
|
4345
|
+}
|
|
4346
|
+
|
4329
|
4347
|
function folders_for_email_addresses {
|
4330
|
4348
|
if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" ]]; then
|
4331
|
4349
|
return
|
|
@@ -7042,6 +7060,7 @@ configure_gpg
|
7042
|
7060
|
encrypt_incoming_email
|
7043
|
7061
|
encrypt_outgoing_email
|
7044
|
7062
|
email_client
|
|
7063
|
+email_from_address
|
7045
|
7064
|
configure_firewall_for_email
|
7046
|
7065
|
folders_for_mailing_lists
|
7047
|
7066
|
folders_for_email_addresses
|