From 919ae72b27f2ac09f69850a0186ab9951c7f739a Mon Sep 17 00:00:00 2001
From: Luis Rascao <luis.rascao@gmail.com>
Date: Tue, 25 Oct 2016 15:25:34 +0100
Subject: Always include nodetool when generating extended start script

Remove redundant check for extended_start_script.
Add tests that enforce this invariant.
---
 src/rlx_prv_assembler.erl | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3