aboutsummaryrefslogtreecommitdiffstats
path: root/src/rlx_prv_assembler.erl
diff options
context:
space:
mode:
authorLuis Rascao <[email protected]>2016-10-25 15:25:34 +0100
committerLuis Rascao <[email protected]>2016-10-25 15:25:34 +0100
commit919ae72b27f2ac09f69850a0186ab9951c7f739a (patch)
tree1e37d7fa8982fe2fd9dcd53c475ca38980e1d782 /src/rlx_prv_assembler.erl
parentd99e527eac918243e4ff3523991c7cd56a5bf1b6 (diff)
downloadrelx-919ae72b27f2ac09f69850a0186ab9951c7f739a.tar.gz
relx-919ae72b27f2ac09f69850a0186ab9951c7f739a.tar.bz2
relx-919ae72b27f2ac09f69850a0186ab9951c7f739a.zip
Always include nodetool when generating extended start script
Remove redundant check for extended_start_script. Add tests that enforce this invariant.
Diffstat (limited to 'src/rlx_prv_assembler.erl')
-rw-r--r--src/rlx_prv_assembler.erl9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl
index 1f64886..8b927b0 100644
--- a/src/rlx_prv_assembler.erl
+++ b/src/rlx_prv_assembler.erl
@@ -349,12 +349,9 @@ write_bin_file(State, Release, OutputDir, RelDir) ->
rlx_release:erts(Release),
ErlOpts);
true ->
- case rlx_state:get(State, extended_start_script, false) of
- true ->
- include_nodetool(BinDir);
- false ->
- ok
- end,
+ %% extended start script needs nodetool so it's
+ %% always included
+ include_nodetool(BinDir),
extended_bin_file_contents(OsFamily, RelName, RelVsn, rlx_release:erts(Release), ErlOpts)
end,
%% We generate the start script by default, unless the user