aboutsummaryrefslogtreecommitdiffstats
path: root/priv/templates/extended_bin
diff options
context:
space:
mode:
authorBikram Chatterjee <[email protected]>2017-09-26 18:11:45 +0200
committerBikram Chatterjee <[email protected]>2017-09-26 18:11:45 +0200
commit769ca6f37e71d9136602a05a06dd4bf114ac465c (patch)
tree60e29ae5e6261d7e369e0481dd22a6642a7e2fbf /priv/templates/extended_bin
parentb7b8622cf925bf889edae51eaf290ec35b6a1aef (diff)
parent0715c2fca256e0b9e5e85b03c61a065de6ce81af (diff)
downloadrelx-769ca6f37e71d9136602a05a06dd4bf114ac465c.tar.gz
relx-769ca6f37e71d9136602a05a06dd4bf114ac465c.tar.bz2
relx-769ca6f37e71d9136602a05a06dd4bf114ac465c.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'priv/templates/extended_bin')
-rwxr-xr-xpriv/templates/extended_bin6
1 files changed, 4 insertions, 2 deletions
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