diff options
| author | Luis Rascão <[email protected]> | 2016-10-25 16:01:49 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-10-25 16:01:49 +0100 |
| commit | f5b11e031383b898b7f517f7f5aa718ddec0b437 (patch) | |
| tree | 715ee22088120f14e38f89f579578bbe383b1fb4 /src | |
| parent | 53a87edc5285042355b545075440985dd3037bc6 (diff) | |
| parent | 919ae72b27f2ac09f69850a0186ab9951c7f739a (diff) | |
| download | relx-f5b11e031383b898b7f517f7f5aa718ddec0b437.tar.gz relx-f5b11e031383b898b7f517f7f5aa718ddec0b437.tar.bz2 relx-f5b11e031383b898b7f517f7f5aa718ddec0b437.zip | |
Merge pull request #529 from lrascao/feature/include_nodetool_on_extended_start_script
Always include nodetool when generating extended start script
Diffstat (limited to 'src')
| -rw-r--r-- | src/rlx_prv_assembler.erl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl index 030a9b3..0eac379 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 |