From bcb1b4a163694347604f3ad4fef254737fe923ff Mon Sep 17 00:00:00 2001 From: Levente Polyak Date: Wed, 12 Feb 2020 00:05:00 +0100 Subject: offload-build: handle user specific makepkg.conf on the remote host This ensures we take user specific config values for PKGDEST into account when printing the package list. This is required as devtools archbuild_cmd puts packages potentially into the user defined PKGDEST which the package list would otherwise miss. --- offload-build.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/offload-build.in b/offload-build.in index 80b67da..33c82a0 100755 --- a/offload-build.in +++ b/offload-build.in @@ -109,11 +109,12 @@ mapfile -t files < <( printf "%s\n" "" "-> build complete" && printf "\t%s\n" "$temp"/* } >&2 && + makepkg_user_config="${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" && makepkg_config="/usr/share/devtools/makepkg-'"${arch}"'.conf" && if [[ -f /usr/share/devtools/makepkg-'"${repo}"'-'"${arch}"'.conf ]]; then makepkg_config="/usr/share/devtools/makepkg-'"${repo}"'-'"${arch}"'.conf" fi && - makepkg --config "${makepkg_config}" --packagelist + makepkg --config <(cat "${makepkg_user_config}" "${makepkg_config}" 2>/dev/null) --packagelist ') -- cgit v1.2.3-70-g09d2