Commit f26688e6 authored by Vitaly Lipatov's avatar Vitaly Lipatov

unset BASH_ENV after HOME is changed

parent 88e8e6fd
...@@ -131,6 +131,7 @@ epm_create_fake() ...@@ -131,6 +131,7 @@ epm_create_fake()
__assure_exists_rpmbuild __assure_exists_rpmbuild
HOME="$(mktemp -d --tmpdir=$BIGTMPDIR)" || fatal HOME="$(mktemp -d --tmpdir=$BIGTMPDIR)" || fatal
unset BASH_ENV
remove_on_exit $HOME remove_on_exit $HOME
export HOME export HOME
__create_rpmmacros __create_rpmmacros
......
...@@ -69,7 +69,7 @@ __epm_korinf_install_eepm() ...@@ -69,7 +69,7 @@ __epm_korinf_install_eepm()
info "Check https://bugzilla.altlinux.org/44314 for reasons." info "Check https://bugzilla.altlinux.org/44314 for reasons."
info "You can install eepm package from Korinf manually, check instruction at https://eepm.ru" info "You can install eepm package from Korinf manually, check instruction at https://eepm.ru"
info info
info "Trying update eepm from the stable ALT repository ..." info "Trying update eepm from the stable ALT $DISTRVERSION repository ..."
docmd epm install eepm docmd epm install eepm
return return
fi fi
......
...@@ -45,7 +45,7 @@ __epm_pack_run_handler() ...@@ -45,7 +45,7 @@ __epm_pack_run_handler()
[ -n "$debug" ] && bashopt='-x' [ -n "$debug" ] && bashopt='-x'
#info "Running $($script --description 2>/dev/null) ..." #info "Running $($script --description 2>/dev/null) ..."
# TODO: add url info here # TODO: add url info here
( unset EPMCURDIR ; export PATH=$SCPATH ; export HOME=$(pwd) ; docmd $CMDSHELL $bashopt $repackcode "$tarname" "$filefortarname" "$packversion" "$url") || fatal ( unset BASH_ENV ; unset EPMCURDIR ; export PATH=$SCPATH ; export HOME=$(pwd) ; docmd $CMDSHELL $bashopt $repackcode "$tarname" "$filefortarname" "$packversion" "$url") || fatal
returntarname="$(cat "$filefortarname")" || fatal 'pack script $repackcode didn'\''t set tarname' returntarname="$(cat "$filefortarname")" || fatal 'pack script $repackcode didn'\''t set tarname'
local i local i
......
...@@ -122,6 +122,7 @@ __epm_repack_to_rpm() ...@@ -122,6 +122,7 @@ __epm_repack_to_rpm()
# TODO: keep home? # TODO: keep home?
HOME="$(mktemp -d --tmpdir=$BIGTMPDIR)" || fatal HOME="$(mktemp -d --tmpdir=$BIGTMPDIR)" || fatal
unset BASH_ENV
remove_on_exit $HOME remove_on_exit $HOME
export HOME export HOME
__create_rpmmacros __create_rpmmacros
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment