Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/checkpkg.in
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2017-03-28 18:34:42 -0400
committerLuke Shumaker <lukeshu@parabola.nu>2017-04-05 14:42:43 -0400
commit7eefbd294efa5b226fc60953ee2e92f1641fdeea (patch)
tree03bee4c28d894f7dec0266a37d469ce5e8f4b6c1 /checkpkg.in
parent285084879f195c7dab75dc8ddb9c4895ab98f9ec (diff)
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
Diffstat (limited to 'checkpkg.in')
-rw-r--r--checkpkg.in6
1 files changed, 4 insertions, 2 deletions
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