From: Kevin McCarthy <kevin@8t8.us>
Date: Tue, 15 Nov 2016 20:04:16 +0000 (-0800)
Subject: Fix muttbug to check $XDG_CONFIG_HOME.
X-Git-Tag: mutt-1-8-rel~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9183ee7033b420f53bf7e677b042e2035fcfea6a;p=mutt

Fix muttbug to check $XDG_CONFIG_HOME.

Fall back to $HOME/.config if $XDG_CONFIG_HOME is not set.
---

diff --git a/muttbug.sh.in b/muttbug.sh.in
index c6cc94e6..53d9de4d 100644
--- a/muttbug.sh.in
+++ b/muttbug.sh.in
@@ -268,13 +268,18 @@ if test "$CORE" && test -f "$CORE" ; then
 fi
 
 if test "$personal" = "yes" ; then
-	CANDIDATES=".muttrc-${MUTTVERSION} .muttrc .mutt/muttrc-${MUTTVERSION} .mutt/muttrc .config/mutt/muttrc-${MUTTVERSION} .config/mutt/muttrc"
+	xdg_cfg_home=${XDG_CONFIG_HOME:-${HOME}/.config}
+	CANDIDATES="muttrc-${MUTTVERSION} muttrc"
+	DIRECTORIES="${HOME}/. ${HOME}/.mutt/ $xdg_cfg_home/mutt/"
 	MATCHED="none"
-	for f in $CANDIDATES; do
-		if test -f "${HOME}/$f" ; then
-			MATCHED="${HOME}/$f"
-			break
-	        fi
+	for d in $DIRECTORIES ; do
+		for f in $CANDIDATES; do
+			if test -f ${d}${f} ; then
+				MATCHED="${d}${f}"
+				break
+			fi
+		done
+		test "$MATCHED" = "none" || break
 	done
 	
 	if test "$MATCHED" = "none" ; then