diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-12-15 13:30:21 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-12-15 13:30:21 +0000 |
| commit | 26a97eb7474b254a3103bd6e0e960b52daa32555 (patch) | |
| tree | 52fc23e28cc2f81b5dada24b6dc8d6c1dfb64844 | |
| parent | 3bb0a6b329d2451227a4c0bc6576000ce9605ee1 (diff) | |
| download | midipix_build-26a97eb7474b254a3103bd6e0e960b52daa32555.tar.bz2 midipix_build-26a97eb7474b254a3103bd6e0e960b52daa32555.tar.xz | |
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.
| -rw-r--r-- | subr/build_init.subr | 3 | ||||
| -rw-r--r-- | 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"}; |