From 7eefbd294efa5b226fc60953ee2e92f1641fdeea Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@parabola.nu>
Date: Tue, 28 Mar 2017 18:34:42 -0400
Subject: 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
---
 checkpkg.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'checkpkg.in')

diff --git a/checkpkg.in b/checkpkg.in
index fbd30d3..ec58ff6 100644
--- a/checkpkg.in
+++ b/checkpkg.in
@@ -13,8 +13,10 @@ else
 fi
 
 # Source user-specific makepkg.conf overrides
-if [[ -r ~/.makepkg.conf ]]; then
-	source ~/.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
 
 if [[ ! -f PKGBUILD ]]; then
-- 
cgit v1.2.3-54-g00ecf