[arch-projects] [devtools] [PATCH v2] makechrootpkg: Use XDG_CONFIG_HOME for makepkg.conf
Implemented the same way as in makepkg.
Signed-off-by: Johannes Löthberg johannes@kyriasis.com --- Changes since v1:
Accidentally used $HOME instead of $USER_HOME in the elif statement.
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
participants (1)
-
Johannes Löthberg