From 9727b684e60c56775ef071be3707059b1d1518e1 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 13 Jun 2016 00:05:55 +0200
Subject: makechrootpkg: Shorten user-config loading code

Make use of load_vars returning 1 when the file is missing. Avoids
introducing another variable.
---
 makechrootpkg.in | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'makechrootpkg.in')

diff --git a/makechrootpkg.in b/makechrootpkg.in
index 6f80384..cd9efce 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -306,12 +306,7 @@ fi
 
 umask 0022
 
-XDG_PACMAN_DIR="${XDG_CONFIG_HOME:-$USER_HOME/.config}/pacman"
-if [[ -r "$XDG_PACMAN_DIR/makepkg.conf" ]]; then
-	load_vars "$XDG_PACMAN_DIR/makepkg.conf"
-elif [[ -r "$USER_HOME/.makepkg.conf" ]]; then
-	load_vars "$USER_HOME/.makepkg.conf"
-fi
+load_vars "${XDG_CONFIG_HOME:-$USER_HOME/.config}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
 load_vars /etc/makepkg.conf
 
 # Use PKGBUILD directory if these don't exist
-- 
cgit v1.2.3-70-g09d2