diff options
| author | Bikram Chatterjee <[email protected]> | 2017-09-26 18:11:45 +0200 |
|---|---|---|
| committer | Bikram Chatterjee <[email protected]> | 2017-09-26 18:11:45 +0200 |
| commit | 769ca6f37e71d9136602a05a06dd4bf114ac465c (patch) | |
| tree | 60e29ae5e6261d7e369e0481dd22a6642a7e2fbf /priv | |
| parent | b7b8622cf925bf889edae51eaf290ec35b6a1aef (diff) | |
| parent | 0715c2fca256e0b9e5e85b03c61a065de6ce81af (diff) | |
| download | relx-769ca6f37e71d9136602a05a06dd4bf114ac465c.tar.gz relx-769ca6f37e71d9136602a05a06dd4bf114ac465c.tar.bz2 relx-769ca6f37e71d9136602a05a06dd4bf114ac465c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'priv')
| -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 |
4 files changed, 7 insertions, 5 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 ) |