From 26a97eb7474b254a3103bd6e0e960b52daa32555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <lucio@lucioillanes.de>
Date: Fri, 15 Dec 2017 13:30:21 +0000
Subject: subr/build_init.subr:build_init(): don't unset ${DEFAULT_...}
 environment variables. vars/midipix.vars:${DEFAULT_CLEAR_ENV_VARS_EXCEPT}:
 remove implied environment variable names.

---
 subr/build_init.subr | 3 ++-
 vars/midipix.vars    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/subr/build_init.subr b/subr/build_init.subr
index 9ce0d1dc..e940110f 100644
--- a/subr/build_init.subr
+++ b/subr/build_init.subr
@@ -42,7 +42,8 @@ build_init() {
 	_env_vars="$(export | sed -e 's/^export //' -e 's/=.*$//')";
 	_env_vars_except="${DEFAULT_CLEAR_ENV_VARS_EXCEPT}";
 	for _env_var in ${_env_vars}; do
-		if [ "${_env_var#PKG_}" != "${_env_var}" ]; then
+		if [ "${_env_var#DEFAULT_}" != "${_env_var}" ]\
+		|| [ "${_env_var#PKG_}" != "${_env_var}" ]; then
 			_env_vars_except="${_env_vars_except:+${_env_vars_except} }${_env_var}";
 		fi;
 	done;
diff --git a/vars/midipix.vars b/vars/midipix.vars
index 249a42ee..3b0e4e9a 100644
--- a/vars/midipix.vars
+++ b/vars/midipix.vars
@@ -99,7 +99,7 @@
 : ${DEFAULT_CHECK_PREREQ_PERL_MODULES:="
 	autodie ExtUtils::MakeMaker"};
 : ${DEFAULT_CLEAR_ENV_VARS_EXCEPT:="
-	DEFAULT_GITROOT DEFAULT_GITROOT_HEAD HOME PATH SHELL TERM DEFAULT_TARBALL_SIGN_GPG_KEY USER"};
+	HOME PATH SHELL TERM DEFAULT_TARBALL_SIGN_GPG_KEY USER"};
 : ${DEFAULT_CLEAR_PREFIX_PATHS:="
 	bin i686-nt32-midipix doc include info lib lib64 libexec man minipix native
 	sbin share tmp usr x86_64-nt64-midipix x86_64-w64-mingw32 midipix.sh midipix_shortcut.vbs README"};
-- 
cgit v1.2.3