Commit 788f9abe authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm pack/play: don't export EPM_VERBOSE anymore

parent 722b9b25
...@@ -40,12 +40,13 @@ __epm_pack() ...@@ -40,12 +40,13 @@ __epm_pack()
export SUDO export SUDO
local bashopt='' local bashopt=''
[ -n "$verbose" ] && bashopt='-x' && export EPM_VERBOSE="$verbose" [ -n "$verbose" ] && bashopt='-x'
#info "Running $($script --description 2>/dev/null) ..." #info "Running $($script --description 2>/dev/null) ..."
docmd $CMDSHELL $bashopt $repackcode "$tarname" "$filefortarname" || fatal docmd $CMDSHELL $bashopt $repackcode "$tarname" "$filefortarname" || fatal
returntarname="$(cat "$filefortarname")" || fatal "pack script $repackcode didn't set tarname" returntarname="$(cat "$filefortarname")" || fatal "pack script $repackcode didn't set tarname"
if [ -n "$download_only" ] ; then if [ -n "$download_only" ] ; then
echo
cp $returntarname . cp $returntarname .
return return
fi fi
......
...@@ -151,10 +151,11 @@ __epm_play_run() ...@@ -151,10 +151,11 @@ __epm_play_run()
set_sudo set_sudo
export SUDO export SUDO
# keep EPM_AUTO for non epm code (epm uses EPM_OPTIONS now)
[ -n "$non_interactive" ] && export EPM_AUTO="--auto" [ -n "$non_interactive" ] && export EPM_AUTO="--auto"
local bashopt='' local bashopt=''
[ -n "$verbose" ] && bashopt='-x' && export EPM_VERBOSE="$verbose" [ -n "$verbose" ] && bashopt='-x'
#info "Running $($script --description 2>/dev/null) ..." #info "Running $($script --description 2>/dev/null) ..."
docmd $CMDSHELL $bashopt $script "$@" docmd $CMDSHELL $bashopt $script "$@"
} }
......
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