diff options
| author | Tristan Sloughter <[email protected]> | 2013-10-15 09:19:01 -0700 |
|---|---|---|
| committer | Tristan Sloughter <[email protected]> | 2013-10-15 09:19:01 -0700 |
| commit | cc47d493933b8b67e5dba442dfac6048cc6d0371 (patch) | |
| tree | c2a8a81e90664ac3694e511eea3f5c5b8a556a7c | |
| parent | b6c988c9e00d3b006840f46d874539b776d183b5 (diff) | |
| parent | 3991143297cee6751bba0f0d7def9a7ca7dcf4d7 (diff) | |
| download | relx-cc47d493933b8b67e5dba442dfac6048cc6d0371.tar.gz relx-cc47d493933b8b67e5dba442dfac6048cc6d0371.tar.bz2 relx-cc47d493933b8b67e5dba442dfac6048cc6d0371.zip | |
Merge pull request #70 from evax/erts_include_fixes
Fixes for erts_include
| -rw-r--r-- | src/rlx_prv_assembler.erl | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl index 5389fde..5896235 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]), @@ -731,7 +729,7 @@ REMSH_NAME=`echo $NAME_ARG | awk '{print $2}'` # Note the `date +%s`, used to allow multiple remsh to the same node transparently REMSH_NAME_ARG=\"$REMSH_TYPE remsh`date +%s`@`echo $REMSH_NAME | awk -F@ '{print $2}'`\" -REMSH_REMSH_ARG=\"-remsh $REMSH_NAME\" +REMSH_REMSH_ARG=\"-remsh $REMSH_NAME -boot start_clean\" # Extract the target cookie COOKIE_ARG=`grep '^-setcookie' $VMARGS_PATH` |