Handle makepkg.conf more consistently

 - checkpkg:    Check ~/.config/pacman/makepkg.conf ; not just
                ~/.makepkg.conf
 - commitpkg:   Likewise
 - rebuildpkgs: Check for user makepkg.conf files, not just the system
                one in /etc

1 files changed, 4 insertions, 2 deletions

diff --git a/commitpkg.in b/commitpkg.in
index d31f6ba..1f9492c 100644
--- a/commitpkg.in
+++ b/commitpkg.in
@@ -11,8 +11,10 @@ else
 fi
 
 # Source user-specific makepkg.conf overrides
-if [[ -r ~/.makepkg.conf ]]; then
-	. ~/.makepkg.conf
+if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" ]]; then
+	source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf"
+elif [[ -r "$HOME/.makepkg.conf" ]]; then
+	source "$HOME/.makepkg.conf"
 fi
 
 cmd=${0##*/}