modified bin/mw, modified share/mpop-temp, modified share/msmtp-temp

3 files changed, 5 insertions, 4 deletions

diff --git a/bin/mw b/bin/mw
index 6d7f669..a143f17 100755
--- a/bin/mw
+++ b/bin/mw
@@ -60,13 +60,13 @@ checkbasics() {
   command -V gpg >/dev/null 2>&1 && GPG="gpg" || GPG="gpg2"
   PASSWORD_STORE_DIR="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
   [ -r "$PASSWORD_STORE_DIR/.gpg-id" ] || {
-    echo "First run \`pass init <yourgpgemail>\` to set up a password archive."
+    echo "First run \`pass init mail/mutt/<yourgpgemail>\` to set up a password archive."
     echo "(If you don't already have a GPG key pair, first run \`$GPG --full-generate-key\`.)"
     exit 1
   }
 }
 
-getaccounts() { accounts="$(find -L "$accdir" -type f 2>/dev/null | grep -o "\S*.muttrc" | sed "s|.*/\([0-9]-\)*||;s/\.muttrc$//" | nl)"; }
+getaccounts() { accounts="$(find -L "$accdir" -type f 2>/dev/null | grep -o "\S*.muttrc" | sed "s|.*/\([0-9]-\)*||;s/\.muttrc$//" | nl -v 0)"; }
 
 list() { getaccounts && [ -n "$accounts" ] && echo "$accounts" || exit 1; }
 
@@ -255,6 +255,7 @@ getboxes() {
     mailboxes="$(printf "%s" "$mailboxes" | sed '/^$/d')"
   fi
   [ "$type" = "pop" ] && mailboxes="INBOX"
+  idnum="-1"
   for x in $(
     sed -n "/^macro.* i[0-9] / s/\(^macro.* i\| .*\)//gp " "$muttrc" 2>/dev/null | sort -u
     echo 0
diff --git a/share/mpop-temp b/share/mpop-temp
index cc51d75..63210fb 100644
--- a/share/mpop-temp
+++ b/share/mpop-temp
@@ -5,4 +5,4 @@ host $imap
 port $iport
 timeout 10
 delivery maildir $maildir/$fulladdr/INBOX
-passwordeval pass $passprefix$fulladdr
+passwordeval pass mail/mutt/$passprefix$fulladdr
diff --git a/share/msmtp-temp b/share/msmtp-temp
index 7333437..81f4950 100644
--- a/share/msmtp-temp
+++ b/share/msmtp-temp
@@ -3,7 +3,7 @@ host $smtp
 port $sport
 from $fulladdr
 user $login
-passwordeval "pass $passprefix$fulladdr"
+passwordeval "pass mail/mutt/$passprefix$fulladdr"
 auth on
 tls on
 tls_trust_file	$sslcert