| @@ -96,7 +96,7 @@ To give you an example of the interface, here's an idea: | |||||
| ## New stuff and improvements since the original release | ## 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. | - `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. | - 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. | - `isync`/`mbsync` has replaced `offlineimap` as the backend. | ||||
| @@ -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" | [ -d "$HOME/.local/share/password-store" ] && export PASSWORD_STORE_DIR="$HOME/.local/share/password-store" | ||||
| fi | fi | ||||
| configdir=${XDG_CONFIG_HOME:-$HOME/.config} | 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 | lastrun=${XDG_CACHE_HOME:-$HOME/.cache}/.mailsynclastrun | ||||
| if [[ -f $configdir/isync/mbsyncrc ]]; then | if [[ -f $configdir/isync/mbsyncrc ]]; then | ||||
| mbsyncrc="$configdir/isync/mbsyncrc" | mbsyncrc="$configdir/isync/mbsyncrc" | ||||
| @@ -29,7 +29,7 @@ mwmuttdir="$mwconfigdir/mutt" | |||||
| # Directory for account settings | # Directory for account settings | ||||
| mwaccrcdir="$mwmuttdir/accounts" | mwaccrcdir="$mwmuttdir/accounts" | ||||
| # Location of mail storage | # Location of mail storage | ||||
| mwmaildir="${MAILDIR:-${XDG_DATA_HOME:-$HOME/.local/share}/mail}" | |||||
| mwmaildir="${MAILDIR:-$HOME/mail}" | |||||
| # Regex to confirm valid email address | # Regex to confirm valid email address | ||||
| mwemailre=".\+@.\+\\..\+" | mwemailre=".\+@.\+\\..\+" | ||||
| mwshare="$prefix/share/mutt-wizard" | mwshare="$prefix/share/mutt-wizard" | ||||
| @@ -40,9 +40,7 @@ If the user chooses to keep offline email with | |||||
| it will be kept in | it will be kept in | ||||
| .I $MAILDIR | .I $MAILDIR | ||||
| which defaults to | which defaults to | ||||
| .I $XDG_DATA_HOME/share/mail/ | |||||
| which defaults to | |||||
| .I ~/.local/share/mail/. | |||||
| .I $HOME/mail/. | |||||
| .B notmuch | .B notmuch | ||||
| can be used to index and search this mail by giving this directory when first running | can be used to index and search this mail by giving this directory when first running | ||||
| .B notmuch setup. | .B notmuch setup. | ||||