diff options
| -rwxr-xr-x | priv/templates/bin | 2 | ||||
| -rw-r--r-- | priv/templates/bin_windows | 2 | ||||
| -rwxr-xr-x | priv/templates/extended_bin | 6 | ||||
| -rw-r--r-- | priv/templates/extended_bin_windows | 2 | ||||
| -rw-r--r-- | src/rlx_prv_assembler.erl | 2 | ||||
| -rw-r--r-- | test/rlx_extended_bin_SUITE.erl | 8 |
6 files changed, 9 insertions, 13 deletions
diff --git a/priv/templates/bin b/priv/templates/bin index 8bb6890..523b88d 100755 --- a/priv/templates/bin +++ b/priv/templates/bin @@ -22,7 +22,7 @@ find_erts_dir() { else __erl="$(which erl)" code="io:format(\"~s\", [code:root_dir()]), halt()." - __erl_root="$("$__erl" -noshell -eval "$code")" + __erl_root="$("$__erl" -boot no_dot_erlang -noshell -eval "$code")" ERTS_DIR="$__erl_root/erts-$ERTS_VSN" ROOTDIR="$__erl_root" fi diff --git a/priv/templates/bin_windows b/priv/templates/bin_windows index e66049e..b3ce796 100644 --- a/priv/templates/bin_windows +++ b/priv/templates/bin_windows @@ -60,7 +60,7 @@ cd %rootdir% @for /f "delims=" %%i in ('where erl') do ( set erl=%%i ) -@set dir_cmd="%erl%" -noshell -eval "io:format(\"~s\", [filename:nativename(code:root_dir())])." -s init stop +@set dir_cmd="%erl%" -boot no_dot_erlang -noshell -eval "io:format(\"~s\", [filename:nativename(code:root_dir())])." -s init stop @for /f "delims=" %%i in ('%%dir_cmd%%') do ( set erl_root=%%i ) diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin index ed68748..2580dcc 100755 --- a/priv/templates/extended_bin +++ b/priv/templates/extended_bin @@ -120,7 +120,7 @@ find_erts_dir() { else __erl="$(which erl)" code="io:format(\"~s\", [code:root_dir()]), halt()." - __erl_root="$("$__erl" -noshell -eval "$code")" + __erl_root="$("$__erl" -boot no_dot_erlang -noshell -eval "$code")" ERTS_DIR="$__erl_root/erts-$ERTS_VSN" ROOTDIR="$__erl_root" fi @@ -325,6 +325,7 @@ RELX_CONFIG_PATH=$(check_replace_os_vars sys.config $RELX_CONFIG_PATH) # Make sure log directory exists mkdir -p "$RUNNER_LOG_DIR" +test -z "$PIPE_DIR" && PIPE_BASE_DIR='/tmp/erl_pipes/' PIPE_DIR="${PIPE_DIR:-/tmp/erl_pipes/$NAME/}" # Extract the target cookie @@ -378,6 +379,7 @@ case "$1" in HEART_COMMAND="$RELEASE_ROOT_DIR/bin/$REL_NAME $CMD" export HEART_COMMAND + test -z "$PIPE_BASE_DIR" || mkdir -m 1777 -p "$PIPE_BASE_DIR" mkdir -p "$PIPE_DIR" relx_run_hooks "$PRE_START_HOOKS" @@ -596,7 +598,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/priv/templates/extended_bin_windows b/priv/templates/extended_bin_windows index d5361b6..7c88b66 100644 --- a/priv/templates/extended_bin_windows +++ b/priv/templates/extended_bin_windows @@ -114,7 +114,7 @@ @for /f "delims=" %%i in ('where erl') do @( set erl=%%i ) -@set dir_cmd="%erl%" -noshell -eval "io:format(\"~s\", [filename:nativename(code:root_dir())])." -s init stop +@set dir_cmd="%erl%" -boot no_dot_erlang -noshell -eval "io:format(\"~s\", [filename:nativename(code:root_dir())])." -s init stop @for /f "delims=" %%i in ('%%dir_cmd%%') do @( set erl_root=%%i ) 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), |