Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2018-10-16 01:58:31 -0400
committerLevente Polyak <anthraxx@archlinux.org>2019-08-09 19:40:05 +0200
commitb7ce90fefc371b47c9036d36d741139a4dd8efe2 (patch)
treeee8ac8b85fb917122ec1354aaa94fcd2983f8c97
parentf52002955c9d1c0809fa31d91d398c5a1fdcee0a (diff)
makechrootpkg: load makepkg.conf variables correctly
Since makepkg.conf is a bash-compatible configuration file, it must be sourced. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
-rw-r--r--makechrootpkg.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 52e834b..4ea008b 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -69,7 +69,7 @@ load_vars() {
[[ -f $makepkg_conf ]] || return 1
for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER; do
- [[ -z ${!var:-} ]] && eval "$(grep -a "^${var}=" "$makepkg_conf")"
+ [[ -z ${!var:-} ]] && eval "$(source "$makepkg_conf"; printf "%s='%s'" "$var" "${!var}")"
done
return 0