From 1ecd6be1a3e9ed0eaae1f004f38a9fa30ab56633 Mon Sep 17 00:00:00 2001
From: Roland Puntaier <roland.puntaier@gmail.com>
Date: Sat, 31 Aug 2019 09:37:45 +0200
Subject: [PATCH] drop XDG_DATA_HOME: just $MAILDIR defaulting to $HOME/mail
 (mail is user data, not app data)

---
 README.md    | 2 +-
 bin/mailsync | 2 +-
 bin/mw       | 2 +-
 mw.1         | 4 +---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index e7d873e..6c25177 100644
--- a/README.md
+++ b/README.md
@@ -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.
diff --git a/bin/mailsync b/bin/mailsync
index d9188e8..6b21dcb 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 ba5b8d7..ec0b300 100755
--- a/bin/mw
+++ b/bin/mw
@@ -29,7 +29,7 @@ mwmuttdir="$mwconfigdir/mutt"
 # Directory for account settings
 mwaccrcdir="$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.