bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: also move restore_envvars handling into libmakepkg

Browse source 
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Eli Schwartz 2019-05-22 10:44:27 -04:00 • committed by Allan McRae
parent a00615bfda
commit 27e80ca7f6
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
scripts/libmakepkg/util/config.sh.in
View file

@ -54,3 +54,23 @@ source_makepkg_config() {
fi
fi
}
# load makepkg.conf by sourcing the configuration files, and preserving
# existing environment settings
load_makepkg_config() {
# $1: override system config file
local MAKEPKG_CONF=${1:-${MAKEPKG_CONF:-@sysconfdir@/makepkg.conf}}
# preserve environment variables to override makepkg.conf
local restore_envvars=$(
for var in PKGDEST SRCDEST SRCPKGDEST LOGDEST BUILDDIR PKGEXT SRCEXT GPGKEY PACKAGER CARCH; do
# the output of 'declare -p' results in locally scoped values when used within a function
[[ -v $var ]] && printf '%s=%s\n' "$var" "${!var@Q}"
done
)
source_makepkg_config "$MAKEPKG_CONF"
eval "$restore_envvars"
}

7
scripts/makepkg.sh.in
View file

@ -1100,12 +1100,7 @@ done
trap 'trap_exit INT "$(gettext "Aborted by user! Exiting...")"' INT
trap 'trap_exit USR1 "$(gettext "An unknown error has occurred. Exiting...")"' ERR
# preserve environment variables to override makepkg.conf
restore_envvars=$(declare -p PKGDEST SRCDEST SRCPKGDEST LOGDEST BUILDDIR PKGEXT SRCEXT GPGKEY PACKAGER CARCH 2>/dev/null || true)
source_makepkg_config
eval "$restore_envvars"
load_makepkg_config
# override settings from extra variables on commandline, if any
if (( ${#extra_environment[*]} )); then