aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDmitry Ivanov <[email protected]>2015-09-04 19:50:35 +0600
committerDmitry Ivanov <[email protected]>2015-09-04 19:50:35 +0600
commit9b65de18bf1c8995a804347b4e4ecda6bcf7f03d (patch)
treeea75c72aff97da1685520c8841c5d21098df2110 /src
parent2c8e17e366a548d54f319e8a62d6543d13c64d07 (diff)
downloadrelx-9b65de18bf1c8995a804347b4e4ecda6bcf7f03d.tar.gz
relx-9b65de18bf1c8995a804347b4e4ecda6bcf7f03d.tar.bz2
relx-9b65de18bf1c8995a804347b4e4ecda6bcf7f03d.zip
Fix possible copy-paste bug in rlx_prv_assembler
Diffstat (limited to 'src')
-rw-r--r--src/rlx_prv_assembler.erl18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl
index 9a267e4..1f81ea6 100644
--- a/src/rlx_prv_assembler.erl
+++ b/src/rlx_prv_assembler.erl
@@ -337,24 +337,18 @@ 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