From e3fe7134e2f8d99770226e7a8a7a07cbf106883b Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Mon, 13 Jun 2016 00:00:43 +0200 Subject: makechrootpkg: Use XDG_CONFIG_HOME for makepkg.conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implemented the same way as in makepkg. Signed-off-by: Johannes Löthberg --- makechrootpkg.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 709e824..6f80384 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -306,7 +306,12 @@ fi umask 0022 -load_vars "$USER_HOME/.makepkg.conf" +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 /etc/makepkg.conf # Use PKGBUILD directory if these don't exist -- cgit v1.2.3-70-g09d2