Merge branch 'master' of github.com:LukeSmithxyz/mutt-wizard into master

1 files changed, 6 insertions, 5 deletions

diff --git a/bin/mw b/bin/mw
index 3936b16..e44d580 100755
--- a/bin/mw
+++ b/bin/mw
@@ -10,6 +10,7 @@ command -V gpg >/dev/null 2>&1 && GPG="gpg" || GPG="gpg2"
 ! command -v mbsync >/dev/null && printf "\`mbsync (isync package)\` must be installed to run mutt-wizard.\\n" && exit
 
 prefix="/usr/local"
+pass_prefix="mutt-wizard-"
 muttdir="${XDG_CONFIG_HOME:-$HOME/.config}/mutt"	# Main mutt config location
 accdir="$muttdir/accounts"				# Directory for account settings
 maildir="${XDG_DATA_HOME:-$HOME/.local/share}/mail"	# Location of mail storage
@@ -48,14 +49,14 @@ host $smtp
 port $sport
 from $fulladdr
 user $login
-passwordeval \"pass mutt-wizard-$title\"
+passwordeval \"pass $pass_prefix$title\"
 $starttlsoff
 "
 mbsync_profile="IMAPStore $title-remote
 Host $imap
 Port $iport
 User $login
-PassCmd \"pass mutt-wizard-$title\"
+PassCmd \"pass $pass_prefix$title\"
 AuthMechs LOGIN
 SSLType $ssltype
 CertificateFile $sslcert
@@ -109,7 +110,7 @@ set folder = \"imaps://$login@$imap:$iport\"
 set imap_user = \"$login\"
 set header_cache = $cachedir/$title/headers
 set message_cachedir = $cachedir/$title/bodies
-set imap_pass = \"\`pass mutt-wizard-$title\`\"
+set imap_pass = \"\`pass $pass_prefix$title\`\"
 
 set mbox_type = Maildir
 set ssl_starttls = yes
@@ -219,8 +220,8 @@ protonfinger() { printf "Getting Protonmail bridge fingerprint...\\n"
 	sed -ibu "s/account $title/&\ntls_trust_file\ntls_fingerprint $fingerprint/" "$msmtprc" ; rm -f "$msmtprc"bu
 }
 
-getpass() { while : ; do pass rm -f "mutt-wizard-$title" >/dev/null 2>&1
-		pass insert "mutt-wizard-$title" && break; done ;}
+getpass() { while : ; do pass rm -f "$pass_prefix$title" >/dev/null 2>&1
+		pass insert "$pass_prefix$title" && break; done ;}
 
 formatShortcut() { toappend="$toappend
 macro index,pager g$1 \"<change-folder>=$3<enter>\" \"go to $2\" $MARKER