y0rune/mutt-wizard
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "fulladdr and login merged"

Browse Source 
This reverts commit bfbfa82cbe.
This commit is contained in:
Luke Smith 2019-04-21 05:32:59 -04:00
parent bfbfa82cbe
commit f0bf2250a9
No known key found for this signature in database
GPG Key ID: 4C50B54A911F6252
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mw
View File

@ -23,13 +23,13 @@ msmtp_profile="
account $title account $title
host $smtp host $smtp
port $sport port $sport
from $fulladdr from $login
user $fulladdr user $login
passwordeval \"pass mutt-wizard-$title\"" passwordeval \"pass mutt-wizard-$title\""
mbsync_profile="IMAPStore $title-remote mbsync_profile="IMAPStore $title-remote
Host $imap Host $imap
Port $iport Port $iport
User $fulladdr User $login
PassCmd \"pass mutt-wizard-$title\" PassCmd \"pass mutt-wizard-$title\"
SSLType IMAPS SSLType IMAPS
CertificateFile /etc/ssl/certs/ca-certificates.crt CertificateFile /etc/ssl/certs/ca-certificates.crt
@ -82,7 +82,7 @@ set realname = \"$realname\"
set from = \"$fulladdr\" set from = \"$fulladdr\"
set sendmail = \"/usr/bin/msmtp -a $title\" set sendmail = \"/usr/bin/msmtp -a $title\"
set folder = \"imaps://$fulladdr@$imap:$iport\" set folder = \"imaps://$fulladdr@$imap:$iport\"
set imap_user = \"$fulladdr\" set imap_user = \"$login\"
set header_cache = $accdir/$title/cache/headers set header_cache = $accdir/$title/cache/headers
set message_cachedir = $accdir/$title/cache/bodies set message_cachedir = $accdir/$title/cache/bodies
set certificate_file = $accdir/$title/certificates set certificate_file = $accdir/$title/certificates
@ -148,6 +148,10 @@ EOF
read -r title read -r title
printf "\033[0m" printf "\033[0m"
done done
printf "If your account has a special username different from your address, insert it now. Otherwise leave this prompt totally blank.\\n\tLogin(?): \033[36m\t"
read -r login
printf "\033[0m"
[ -z "$login" ] && login="$fulladdr"
tmpdir="$(mktemp -d)" tmpdir="$(mktemp -d)"
grep "i[0-9]" "$muttdir/personal.muttrc" 2>/dev/null | awk '{print $3}' | sed -e 's/i//g' > "$tmpdir/mutt_used" grep "i[0-9]" "$muttdir/personal.muttrc" 2>/dev/null | awk '{print $3}' | sed -e 's/i//g' > "$tmpdir/mutt_used"
seq 1 9 > "$tmpdir/mutt_all" seq 1 9 > "$tmpdir/mutt_all"