diff --git a/README.md b/README.md index e7d873e..3dd3afe 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ If you get errors in `neomutt`, install the most recent version manually or manu - `w3m` - view HTML email and images in neomutt. - `notmuch` - index and search mail. Install it and run `notmuch setup`. - Tell it where your mail is (`$MAILDIR` or `~/.local/share/mail/`). + Tell it where your mail is (`$MAILDIR` or `~/Mail`). Although, `mw` will do this automatically, if you haven't set notmuch up before. You can run it in mutt with `ctrl-f`. Run `notmuch new` to process new mail. @@ -96,7 +96,7 @@ To give you an example of the interface, here's an idea: ## New stuff and improvements since the original release -- honors `$MAILDIR`, `$XDG_CONFIG_HOME`, `$XDG_DATA_HOME`, `$XDG_CACHE_HOME`, if defined. +- honors `$MAILDIR`, `$XDG_CONFIG_HOME`, `$XDG_CACHE_HOME`, if defined. - `gm/gM` to sync mail inside `mutt`, as `o/O` has a `mutt` assignment already. - Make channel name equal to email address to avoid choosing a new name for the same thing. - `isync`/`mbsync` has replaced `offlineimap` as the backend. @@ -108,7 +108,7 @@ To give you an example of the interface, here's an idea: Image/video/pdf attachments without relying on the neomutt instance. - abook integration by default. - The messy template files and other directories have been moved or removed, leaving a clean config folder. -- msmtp configs moved to `~/.config/` and mail default location moved to `~/.local/share/mail/`, reducing mess in `~`. +- msmtp configs moved to `~/.config/` and mail default location moved to `~/Mail`, reducing mess in `~`. - `pass` is used as a password manager instead of separately saving passwords. - Script is POSIX sh compliant. - Error handling for the many people who don't read or follow directions. diff --git a/bin/mailsync b/bin/mailsync index d9188e8..7209447 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -13,7 +13,7 @@ if [[ -z $PASSWORD_STORE_DIR ]]; then [ -d "$HOME/.local/share/password-store" ] && export PASSWORD_STORE_DIR="$HOME/.local/share/password-store" fi configdir=${XDG_CONFIG_HOME:-$HOME/.config} -maildir="${MAILDIR:-${XDG_DATA_HOME:-$HOME/.local/share}/mail}" +maildir="${MAILDIR:-$HOME/Mail}" lastrun=${XDG_CACHE_HOME:-$HOME/.cache}/.mailsynclastrun if [[ -f $configdir/isync/mbsyncrc ]]; then mbsyncrc="$configdir/isync/mbsyncrc" diff --git a/bin/mw b/bin/mw index d99e5e0..1ab757d 100755 --- a/bin/mw +++ b/bin/mw @@ -29,7 +29,7 @@ mwmuttdir="$mwconfigdir/mutt" # Directory for account settings mwaccmuttdir="$mwmuttdir/accounts" # Location of mail storage -mwmaildir="${MAILDIR:-${XDG_DATA_HOME:-$HOME/.local/share}/mail}" +mwmaildir="${MAILDIR:-$HOME/mail}" # Regex to confirm valid email address mwemailre=".\+@.\+\\..\+" mwshare="$prefix/share/mutt-wizard" diff --git a/mw.1 b/mw.1 index 5eb08a2..5508d93 100644 --- a/mw.1 +++ b/mw.1 @@ -40,9 +40,7 @@ If the user chooses to keep offline email with it will be kept in .I $MAILDIR which defaults to -.I $XDG_DATA_HOME/share/mail/ -which defaults to -.I ~/.local/share/mail/. +.I $HOME/mail/. .B notmuch can be used to index and search this mail by giving this directory when first running .B notmuch setup.