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 c6cc94e6e9aba6572c00b5817174243c14af0701..53d9de4dbb2cc2ed37d67917f704ddb4b8190233 100644 (file)
--- 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