diff options
| author | Jordan Wilberding <[email protected]> | 2015-09-28 13:57:13 -0700 |
|---|---|---|
| committer | Jordan Wilberding <[email protected]> | 2015-09-28 13:57:13 -0700 |
| commit | 3f0a7246ab43be07e58ee802a142399dac9e6055 (patch) | |
| tree | c5121da1fadf2091e9a0f9fac4a57f3c6e5fef17 | |
| parent | e0a431c3194f0881669075bf8a172ed9fb727518 (diff) | |
| parent | 0c03ac6daa9a85e64c7c0869fbe4ebc0073162a5 (diff) | |
| download | relx-3.7.1.tar.gz relx-3.7.1.tar.bz2 relx-3.7.1.zip | |
Merge pull request #402 from erlware/revert-389-masterv3.7.1
Revert "Fix possible copy-paste bug in rlx_prv_assembler"
| -rw-r--r-- | src/rlx_prv_assembler.erl | 18 |
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 |