diff options
| author | Evax Software <[email protected]> | 2013-10-15 14:55:42 +0200 |
|---|---|---|
| committer | Evax Software <[email protected]> | 2013-10-15 14:55:42 +0200 |
| commit | b59d342e336a5338d2b42a19955763969f28da3f (patch) | |
| tree | de8ca5743611164a47ffa69833bdd50e6fabcefd /src | |
| parent | d8fe19483d1afe15017709058f330ac132e4029a (diff) | |
| download | relx-b59d342e336a5338d2b42a19955763969f28da3f.tar.gz relx-b59d342e336a5338d2b42a19955763969f28da3f.tar.bz2 relx-b59d342e336a5338d2b42a19955763969f28da3f.zip | |
Reuse generated erts directory in tar command
Diffstat (limited to 'src')
| -rw-r--r-- | src/rlx_prv_assembler.erl | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl index b17b2cc..542e1b2 100644 --- a/src/rlx_prv_assembler.erl +++ b/src/rlx_prv_assembler.erl @@ -343,8 +343,10 @@ include_erts(State, Release, OutputDir, RelDir) -> true -> ok = ec_file:mkdir_p(LocalErts), ok = ec_file:copy(ErtsDir, LocalErts, [recursive]), - ok = ec_file:remove(filename:join([LocalErts, "bin", "erl"])), - ok = file:write_file(filename:join([LocalErts, "bin", "erl"]), erl_script(ErtsVersion)), + Erl = filename:join([LocalErts, "bin", "erl"]), + ok = ec_file:remove(Erl), + ok = file:write_file(Erl, erl_script(ErtsVersion)), + ok = file:change_mode(Erl, 8#755), case rlx_state:get(State, extended_start_script, false) of true -> ok = ec_file:copy(filename:join([Prefix, "bin", "start_clean.boot"]), @@ -473,11 +475,7 @@ update_tar(State, TempDir, OutputDir, Name, Vsn, ErtsVersion) -> {"bin", filename:join([OutputDir, "bin"])} | case rlx_state:get(State, include_erts, true) of true -> - [{"erts-"++ErtsVersion, filename:join(TempDir, "erts-"++ErtsVersion)}, - {filename:join(["erts-"++ErtsVersion, "bin", "nodetool"]), - hd(nodetool_contents())}, - {filename:join(["erts-"++ErtsVersion, "bin", "install_upgrade.escript"]), - hd(install_upgrade_escript_contents())}]; + [{"erts-"++ErtsVersion, filename:join(OutputDir, "erts-"++ErtsVersion)}]; false -> [] end], [compressed]), |