From 0c03ac6daa9a85e64c7c0869fbe4ebc0073162a5 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Mon, 28 Sep 2015 15:54:56 -0500 Subject: Revert "Fix possible copy-paste bug in rlx_prv_assembler" --- src/rlx_prv_assembler.erl | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl index 1f81ea6..9a267e4 100644 --- a/src/rlx_prv_assembler.erl +++ b/src/rlx_prv_assembler.erl @@ -337,18 +337,24 @@ write_bin_file(State, Release, OutputDir, RelDir) -> ErlOpts = rlx_state:get(State, erl_opts, ""), {OsFamily, _OsName} = os:type(), - case rlx_state:get(State, include_nodetool, false) of - true -> - include_nodetool(BinDir); - false -> - ok - end, StartFile = case rlx_state:get(State, extended_start_script, false) of false -> + case rlx_state:get(State, include_nodetool, false) of + true -> + include_nodetool(BinDir); + false -> + ok + end, bin_file_contents(OsFamily, RelName, RelVsn, rlx_release:erts(Release), ErlOpts); true -> + case rlx_state:get(State, extended_start_script, false) of + true -> + include_nodetool(BinDir); + false -> + ok + end, extended_bin_file_contents(OsFamily, RelName, RelVsn, rlx_release:erts(Release), ErlOpts) end, %% We generate the start script by default, unless the user -- cgit v1.2.3