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
---
 rebuildpkgs.in | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'rebuildpkgs.in')

diff --git a/rebuildpkgs.in b/rebuildpkgs.in
index 8a141e0..9197231 100644
--- a/rebuildpkgs.in
+++ b/rebuildpkgs.in
@@ -26,6 +26,13 @@ else
 	die '/etc/makepkg.conf not found!'
 fi
 
+# Source user-specific makepkg.conf overrides
+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
+
 bump_pkgrel() {
 	# Get the current pkgrel from SVN and update the working copy with it
 	# This prevents us from incrementing out of control :)
-- 
cgit v1.2.3-54-g00ecf