diff options
| author | Tristan Sloughter <[email protected]> | 2017-08-30 11:11:08 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-08-30 11:11:08 -0700 |
| commit | 430b1d7f5ab75a849d70c82a98614f701a4912c6 (patch) | |
| tree | 16556322b5b7358ed51f0bcdb46e89450f73a01a | |
| parent | dbe93ae3dad33d3a6721b01a6fdc91b120bd340e (diff) | |
| parent | 2ba5ec449413a82ea3d6b9bdd268506b25ef368c (diff) | |
| download | relx-430b1d7f5ab75a849d70c82a98614f701a4912c6.tar.gz relx-430b1d7f5ab75a849d70c82a98614f701a4912c6.tar.bz2 relx-430b1d7f5ab75a849d70c82a98614f701a4912c6.zip | |
Merge pull request #601 from lrascao/fix_non_existing_status_hook
Don't fail status script command if empty
| -rwxr-xr-x | priv/templates/extended_bin | 2 | ||||
| -rw-r--r-- | src/rlx_prv_assembler.erl | 2 | ||||
| -rw-r--r-- | test/rlx_extended_bin_SUITE.erl | 8 |
3 files changed, 3 insertions, 9 deletions
diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin index ed68748..71dd858 100755 --- a/priv/templates/extended_bin +++ b/priv/templates/extended_bin @@ -596,7 +596,7 @@ case "$1" in exit 1 fi - [ "$SCRIPT_DIR/$STATUS_HOOK" ] && . "$SCRIPT_DIR/$STATUS_HOOK" $@ + [ ! -z "${STATUS_HOOK}" ] && [ "$SCRIPT_DIR/$STATUS_HOOK" ] && . "$SCRIPT_DIR/$STATUS_HOOK" $@ ;; help) if [ -z "$2" ]; then 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), |