aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Rascao <[email protected]>2017-07-24 23:21:11 +0100
committerLuis Rascao <[email protected]>2017-07-24 23:36:17 +0100
commit2ba5ec449413a82ea3d6b9bdd268506b25ef368c (patch)
tree16556322b5b7358ed51f0bcdb46e89450f73a01a
parent4ea93cce5bab132818d42248ecfd16d8ab8a5c10 (diff)
downloadrelx-2ba5ec449413a82ea3d6b9bdd268506b25ef368c.tar.gz
relx-2ba5ec449413a82ea3d6b9bdd268506b25ef368c.tar.bz2
relx-2ba5ec449413a82ea3d6b9bdd268506b25ef368c.zip
Don't use builtin status hook as default
Let people define their own when they want to.
-rw-r--r--src/rlx_prv_assembler.erl2
-rw-r--r--test/rlx_extended_bin_SUITE.erl8
2 files changed, 2 insertions, 8 deletions
diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl
index 278756d..475869c 100644
--- a/src/rlx_prv_assembler.erl
+++ b/src/rlx_prv_assembler.erl
@@ -399,7 +399,7 @@ write_bin_file(State, Release, OutputDir, RelDir) ->
Hooks = expand_hooks(BinDir,
rlx_state:get(State,
extended_start_script_hooks,
- [{status, [builtin_status]}]),
+ []),
State),
extended_bin_file_contents(OsFamily, RelName, RelVsn,
rlx_release:erts(Release), ErlOpts,
diff --git a/test/rlx_extended_bin_SUITE.erl b/test/rlx_extended_bin_SUITE.erl
index c049209..a9a7df7 100644
--- a/test/rlx_extended_bin_SUITE.erl
+++ b/test/rlx_extended_bin_SUITE.erl
@@ -1344,13 +1344,7 @@ builtin_status_script(Config) ->
timer:sleep(2000),
{ok, "pong"} = sh(filename:join([OutputDir, "foo", "bin", "foo ping"])),
%% write the status to a file
- {ok, StatusStr} = sh(filename:join([OutputDir, "foo", "bin", "foo status"])),
- ec_file:write(filename:join([OutputDir, "status.txt"]),
- StatusStr ++ ".\n"),
- os:cmd(filename:join([OutputDir, "foo", "bin", "foo stop"])),
- {ok, [Status]} = file:consult(filename:join([OutputDir, "status.txt"])),
- Apps = lists:map(fun({App, _, _}) -> App end, Status),
- {ok, [goal_app, kernel, stdlib] = lists:sort(Apps)}.
+ {ok, ""} = sh(filename:join([OutputDir, "foo", "bin", "foo status"])).
custom_status_script(Config) ->
LibDir1 = proplists:get_value(lib1, Config),