From 459ca7d5a0f9737dba5fb42315dac0237397c8fb Mon Sep 17 00:00:00 2001
From: Luke Smith <luke@lukesmith.xyz>
Date: Fri, 16 Mar 2018 12:34:46 -0700
Subject: [PATCH] interface tweaks

---
 README.md      |  4 ++--
 mutt-wizard.sh | 24 +++++++++++-------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 341ced8..7d34042 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,8 @@ The mutt-wizard is all of this in a simple ncurses menu. It's really just a litt
 
 The system takes an email and autodetect its server settings, generating a muttrc and offlineimaprc profile automatically. If it can't do so, it simply prompts you for these (which you can easily look up) and will put them all in the right places. You get:
 
-+ Automatic configuration of mutt and offlineimap
-+ Automatic encryption and safe storage of passwords which are used by mutt and offlineimap when necessary
++ Automatic configuration of mutt and offlineimap.
++ Automatic encryption and safe storage of passwords which are used by mutt and offlineimap when necessary.
 + Multiple account management in mutt: jump from account to account with the `i` prefix in mutt: `i1`: first email account, `i5`: fifth, etc.
 + Easy movement to mail folders in mutt: `gi`: go to inbox, `gs` to sent mail, `ga` to archive, `gS` to spam, `gd` to drafts, etc.
 + Some default controls and colors. This system is going to be integrated into my [public auto-rice script](https://larbs.xyz) so I want it to look pretty and be usable out the box.
diff --git a/mutt-wizard.sh b/mutt-wizard.sh
index 5a1e001..1fd21a8 100755
--- a/mutt-wizard.sh
+++ b/mutt-wizard.sh
@@ -228,15 +228,14 @@ wipe () { rm $HOME/.offlineimaprc
 while : ;
 	do
 choice=$(dialog --title "Luke's mutt/offlineIMAP wizard" --nocancel \
-	--menu "What would you like to do?" 16 45 8 \
+	--menu "What would you like to do?" 14 45 7 \
 	0 "List all email accounts configured." \
 	1 "Add an email account." \
-	2 "Auto-detect mailboxes for an account." \
-	3 "Enable/disable autosync." \
-	4 "Change an account's password." \
-	5 "Remove an email account." \
-	6 "Remove all email accounts." \
-	7 "Exit this wizard." \
+	2 "Enable/disable autosync." \
+	3 "Change an account's password." \
+	4 "Remove an email account." \
+	5 "Remove all email accounts." \
+	6 "Exit this wizard." \
 	 3>&1 1>&2 2>&3 3>&1 )
 
 case $choice in
@@ -244,11 +243,10 @@ case $choice in
 $(grep ~/.offlineimaprc -e "^accounts =" | sed 's/accounts =//g')
 " 6 60;;
 1) chooseAdd;;
-2) detectWarning && chooseDetect ;;
-3) chooseSync;;
-4) inventory && for i in $userchoices; do changePassword $i ; done;;
-5) inventory && for i in $userchoices; do removeAccount $i ; done;;
-6) (dialog --defaultno --title "Wipe all custom neomutt/offlineIMAP settings?" --yesno "Would you like to wipe all of the mutt/offlineIMAP settings generated by the system?" 6 60 && wipe) ;;
-7) clear && break ;;
+2) chooseSync;;
+3) inventory && for i in $userchoices; do changePassword $i ; done;;
+4) inventory && for i in $userchoices; do removeAccount $i ; done;;
+5) (dialog --defaultno --title "Wipe all custom neomutt/offlineIMAP settings?" --yesno "Would you like to wipe all of the mutt/offlineIMAP settings generated by the system?" 6 60 && wipe) ;;
+6) clear && break ;;
 esac
 done