Merge pull request #11 from scattenlaeufer/login_name

Ask for a login name during account creation

autoconf/mutt_profile

@@ -2,7 +2,7 @@
 # muttrc file for account $title
 set realname = "$realname"
 set from = "$fulladdr"
-set smtp_url = "smtp://$fulladdr@$smtp:$sport/"
+set smtp_url = "smtp://$login@$smtp:$sport/"
 set sendmail = "/usr/bin/msmtp -a $title"
 set folder = "~/.mail/$title"
 set header_cache = ~/.config/mutt/accounts/$title/cache/headers

autoconf/offlineimap_profile

@@ -5,7 +5,7 @@ remoterepository = $title-remote
 
 [Repository $title-remote]
 type = $type
-remoteuser = $fulladdr
+remoteuser = $login
 sslcacerfile = /etc/ssl/cets/ca-certificates.crt
 remotepasseval = mailpasswd("$title")
 remotehost = $imap

mutt-wizard.sh

@@ -109,6 +109,7 @@ EOF
 fi
 realname=$( dialog --title "Luke's mutt/offlineIMAP autoconfig" --inputbox "Enter the full name you'd like to be identified by on this email account." 10 60 3>&1 1>&2 2>&3 3>&- )
 title=$( dialog --title "Luke's mutt/offlineIMAP autoconfig" --inputbox "Give a short, one-word name for this email account that will differentiate it from other email accounts." 10 60 3>&1 1>&2 2>&3 3>&- )
+login=$(dialog --title "Luke's mutt/offlineIMAP autoconfig" --inputbox "Enter your login for the \"$title\" account.\n(If left empty, the full email address will be used instead.)" 10 60 3>&1 1>&2 2>&3 3>&- )
 # Sets the repo type and other variables for the sed regex.
 if [[ "$service" == "gmail.com" ]];
 	then
@@ -118,6 +119,10 @@ if [[ "$service" == "gmail.com" ]];
 		type="IMAP"
 		delet="Gmail]\/"
 fi
+if [[ -z "$login" ]];
+	then
+		login=$fulladdr
+fi
 # The replacements
 replacement="
 	s/\$realname/$realname/g;
@@ -128,8 +133,8 @@ replacement="
 	s/\$smtp/$smtp/g;
 	s/\$sport/$sport/g;
 	s/\$type/$type/g;
+	s/\$login/$login/g;
 	/$delet/d"
-
 # Gets the first unused shortcut number in the muttrc and puts it in $idnum.
 cat "$muttdir"personal.muttrc | grep i[0-9] | awk '{print $3}' | sed -e 's/i//g' > /tmp/mutt_used
 echo -e "1\n2\n3\n4\n5\n6\n7\n8\n9" > /tmp/mutt_all_possible