aboutsummaryrefslogtreecommitdiffstats
path: root/src/rlx_prv_assembler.erl
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2015-09-28 15:54:56 -0500
committerTristan Sloughter <[email protected]>2015-09-28 15:54:56 -0500
commit0c03ac6daa9a85e64c7c0869fbe4ebc0073162a5 (patch)
tree1b26a6deadb3e9dc96a4e1f9b937da9a7f27c1e4 /src/rlx_prv_assembler.erl
parent864f387bc83e510c4f634e179db01dc230023579 (diff)
downloadrelx-0c03ac6daa9a85e64c7c0869fbe4ebc0073162a5.tar.gz
relx-0c03ac6daa9a85e64c7c0869fbe4ebc0073162a5.tar.bz2
relx-0c03ac6daa9a85e64c7c0869fbe4ebc0073162a5.zip
Revert "Fix possible copy-paste bug in rlx_prv_assembler"
Diffstat (limited to 'src/rlx_prv_assembler.erl')
-rw-r--r--src/rlx_prv_assembler.erl18
1 files 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