From 27e80ca7f61d0eb9861d36c24520a3e081bcb2ec Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 22 May 2019 10:44:27 -0400 Subject: makepkg: also move restore_envvars handling into libmakepkg Signed-off-by: Eli Schwartz Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'scripts/makepkg.sh.in') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f5285a0d..aa03e9d9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -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 -- cgit v1.2.3-54-g00ecf