diff options
| author | Tristan Sloughter <[email protected]> | 2015-09-04 08:56:01 -0500 |
|---|---|---|
| committer | Tristan Sloughter <[email protected]> | 2015-09-04 08:56:01 -0500 |
| commit | 979766f0f57730af8cea94aa23947026af77f286 (patch) | |
| tree | ea75c72aff97da1685520c8841c5d21098df2110 | |
| parent | 2c8e17e366a548d54f319e8a62d6543d13c64d07 (diff) | |
| parent | 9b65de18bf1c8995a804347b4e4ecda6bcf7f03d (diff) | |
| download | relx-979766f0f57730af8cea94aa23947026af77f286.tar.gz relx-979766f0f57730af8cea94aa23947026af77f286.tar.bz2 relx-979766f0f57730af8cea94aa23947026af77f286.zip | |
Merge pull request #389 from ethercrow/master
Fix possible copy-paste bug in rlx_prv_assembler
| -rw-r--r-- | src/rlx_prv_assembler.erl | 18 |
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 |