summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLevente Polyak <anthraxx@archlinux.org>2020-02-12 00:05:00 +0100
committerLevente Polyak <anthraxx@archlinux.org>2020-02-12 00:05:00 +0100
commitbcb1b4a163694347604f3ad4fef254737fe923ff (patch)
tree9c7e27e7f6c1acbe63666db36b0a5d17739c1309
parent57fb44b97662e1c3753c150a231c5a362049025a (diff)
downloaddevtools-bcb1b4a163694347604f3ad4fef254737fe923ff.tar.gz
devtools-bcb1b4a163694347604f3ad4fef254737fe923ff.tar.xz
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.
-rwxr-xr-xoffload-build.in3
1 files changed, 2 insertions, 1 deletions
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
')