Merge branch 'master' of https://github.com/lukesmithxyz/mutt-wizard

1 files changed, 4 insertions, 7 deletions

diff --git a/bin/mw b/bin/mw
index a89d5ef..e2939ec 100755
--- a/bin/mw
+++ b/bin/mw
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 command -V gpg >/dev/null 2>&1 && GPG="gpg" || GPG="gpg2"
 [ -z ${PASSWORD_STORE_DIR+x} ] && PASSWORD_STORE_DIR="$HOME/.password-store"
 [ -r "$PASSWORD_STORE_DIR/.gpg-id" ] &&
@@ -8,11 +8,7 @@ command -V gpg >/dev/null 2>&1 && GPG="gpg" || GPG="gpg2"
     }
 ! command -v mbsync >/dev/null && printf "\`mbsync\` must be installed to run mutt-wizard.\\n" && exit
 
-case "$(uname)" in
-	Linux) prefix="/usr" ;;
-	*)  prefix="/usr/local" ;;
-esac
-
+prefix="/usr/local"
 muttdir="$HOME/.config/mutt"		# Main mutt config location
 accdir="$muttdir/accounts"		# Directory for account settings
 maildir="$HOME/.local/share/mail"	# Location of mail storage
@@ -73,6 +69,7 @@ Patterns * !\"[Gmail]/All Mail\"
 Create Both
 SyncState *
 MaxMessages $maxmes
+ExpireUnread no
 # End profile
 "
 
@@ -242,7 +239,7 @@ finalize() { \
 	trash=$(echo "$boxes" | grep -i -m 1 trash | sed 's/=/+/g')
 	sed -ibu "/^mailboxes\|^set record\|^set postponed\|^set trash\|^set spoolfile/d" "$accdir/$idnum-$title.muttrc" ; rm -f "$accdir/$idnum-$title.muttrcbu"
 	{ echo "set spoolfile = \"$spoolfile\""; echo "set record = \"$record\""; echo "set postponed = \"$postponed\""; echo "set trash = \"$trash\""; } >> "$accdir/$idnum-$title.muttrc"
-	echo "mailboxes =$title ===================== $(echo "$boxes" | sed -e "s/^\|$/\"/g" | tr "\n" " ")" >> "$accdir/$idnum-$title.muttrc"
+	echo "mailboxes $(echo "$boxes" | sed -e "s/^\|$/\"/g" | tr "\n" " ")" >> "$accdir/$idnum-$title.muttrc"
 	printf "Setting up your keyboard shortcuts for jumping between mailboxes...\\n"
 	sed -ibu "/# mw-autogenerated/d" "$accdir/$idnum-$title.muttrc" ; rm -f "$accdir/$idnum-$title.muttrcbu"
 	echo "$boxes" | grep -i inbox | head -n 1 | formatShortcut i inbox