modified bin/mw, modified mw.1

2 files changed, 10 insertions, 9 deletions

diff --git a/bin/mw b/bin/mw
index 8f5d181..f54418f 100755
--- a/bin/mw
+++ b/bin/mw
@@ -206,15 +206,15 @@ askinfo() {
   [ -z "$passprefix" ] && passprefix=""
   hostname="${fulladdr#*@}"
   login="${login:-$fulladdr}"
-  if [ -n "${password+x}" ] && [ ! -f "$PASSWORD_STORE_DIR/$passprefix$fulladdr.gpg" ]; then
+  if [ -n "${password+x}" ] && [ ! -f "$PASSWORD_STORE_DIR/mutt-wizard/$passprefix$fulladdr.gpg" ]; then
     insertpass
-  elif [ ! -f "$PASSWORD_STORE_DIR/$passprefix$fulladdr.gpg" ]; then
+  elif [ ! -f "$PASSWORD_STORE_DIR/mutt-wizard/$passprefix$fulladdr.gpg" ]; then
     getpass
   fi
 }
 
 insertpass() {
-  printf "%s" "$password" | pass insert -fe "$PASSWORD_STORE_DIR/$passprefix$fulladdr"
+  printf "%s" "$password" | pass insert -fe "$PASSWORD_STORE_DIR/mutt-wizard/$passprefix$fulladdr"
 }
 
 errorexit() {
@@ -321,23 +321,24 @@ Main actions:
   -u			Show a registered email account information
 
 Options allowed with -a:
-  -f	Assume typical English mailboxes without attempting log-on.
+  -f	Assume typical English mailboxes without attempting log-on
   -i	IMAP/POP server address
   -I	IMAP/POP server port
+  -m	Maximum number of emails to be kept offline (default=0: unlimited)
   -n	"Real name" to be on the email account
   -N	Account login name if not full address
-  -o	Configure address, but keep mail online.
-  -p	Add for a POP server instead of IMAP.
+  -o	Configure address, but keep mail online
+  -p	Add for a POP server instead of IMAP
   -P	Pass Prefix (prefix of the file where password is stored)
   -s	SMTP server address
   -S	SMTP server port
   -x	Password for account (recommended to be in double quotes)
-  -X	Delete an account's local email too when deleting.
+  -X	Delete an account's local email too when deleting
 
 NOTE: Once at least one account is added, you can run
 \`mbsync -a\` to begin downloading mail.
 
-To change an account's password, run \`pass edit '$passprefix'your@email.com\`.
+To change an account's password, run \`pass edit '(pass prefix with -P option)'your@email.com\`.
 EOF
 }
 
diff --git a/mw.1 b/mw.1
index c978330..aaf63ea 100644
--- a/mw.1
+++ b/mw.1
@@ -57,7 +57,7 @@ sync all email accounts
 These can be specified on the command line, otherwise, you will be prompted for what is necessary. mutt-wizard knows the IMAP/SMTP server information for most email providers, so specifying them is usually redundant.
 .TP
 .B -m number
-Set a maximum number of messages to be stored offline.
+Set a maximum number of messages to be stored offline. 0 means unlimit. (default=0).
 .TP
 .B -n Billy
 Real name which will appear in emails. Should be put in quotes if multiple words.