mutt-wizard

commit 06f416f5eb73c4d01df25046d17a1cfdbfb116ae
parent 93584f2c1dd6059e6afa0cae3c4108f75ae8aeab
Author: Jonassenher <jonflod@outlook.com>
Date:   Sun, 30 Aug 2020 18:28:21 +0200

Support for XDG Base Directory

Today's mutt-wizard does not support the XDG Base Directory specifications (https://wiki.archlinux.org/index.php/XDG_Base_Directory) because it says the user should be able to change the config, cache, data folders etc. using the environmental variables XDG_CONFIG_HOME, XDG_CACHE_HOME, and XDG_DATA_HOME, and instead hard codes the default paths ~/.config, ~/.cache, and ~/.local/share. My commit corrects this.
Diffstat:
M
bin/mw
 | 
16
++++++++--------

1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/bin/mw b/bin/mw
@@ -10,17 +10,17 @@ command -V gpg >/dev/null 2>&1 && GPG="gpg" || GPG="gpg2"
 ! command -v mbsync >/dev/null && printf "\`mbsync (isync package)\` must be installed to run mutt-wizard.\\n" && exit
 
 prefix="/usr/local"
-muttdir="$HOME/.config/mutt"		# Main mutt config location
+muttdir="${XDG_CONFIG_HOME:-$HOME/.config}/mutt"		# Main mutt config location
 accdir="$muttdir/accounts"		# Directory for account settings
-maildir="$HOME/.local/share/mail"	# Location of mail storage
+maildir="${XDG_DATA_HOME:-$HOME/.local/share}/mail"	# Location of mail storage
 namere="^[a-z_][a-z0-9_-]*$"		# Regex to ensure viable username
 emailre=".+@.+\..+" 			# Regex to confirm valid email address
 muttshare="$prefix/share/mutt-wizard"
-mbsyncrc="$HOME/.mbsyncrc"
+mbsyncrc="${MBSYNCRC_HOME:-$HOME/.mbsyncrc}"
 mwconfig="$muttshare/mutt-wizard.muttrc"
-cachedir="$HOME/.cache/mutt-wizard"
+cachedir="${XDG_CACHE_HOME:-$HOME/.cache}/mutt-wizard"
 muttrc="$muttdir/muttrc"
-msmtprc="$HOME/.config/msmtp/config"
+msmtprc="${XDG_CACHE_HOME:-$HOME/.config}/msmtp/config"
 ssltype="IMAPS"				# This is later changed to `None` later in the script if using Protonmail
 
 for x in "/etc/ssl/certs/ca-certificates.crt" "/etc/pki/tls/certs/ca-bundle.crt" "/etc/ssl/ca-bundle.pem" "/etc/pki/tls/cacert.pem" "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" "/etc/ssl/cert.pem" "/usr/local/share/ca-certificates/"
@@ -38,7 +38,7 @@ msmtp_header="defaults
 auth	on
 tls	on
 tls_trust_file	$sslcert
-logfile	~/.config/msmtp/msmtp.log
+logfile	$XDG_CONFIG_HOME/msmtp/msmtp.log
 "
 msmtp_profile="account $title
 host $smtp
@@ -59,8 +59,8 @@ CertificateFile $sslcert
 
 MaildirStore $title-local
 Subfolders Verbatim
-Path ~/.local/share/mail/$title/
-Inbox ~/.local/share/mail/$title/INBOX
+Path $XDG_DATA_HOME/mail/$title/
+Inbox $XDG_DATA_HOME/mail/$title/INBOX
 Flatten .
 
 Channel $title