diff options
| -rwxr-xr-x | priv/templates/bin | 26 | ||||
| -rwxr-xr-x | priv/templates/extended_bin | 16 |
2 files changed, 21 insertions, 21 deletions
diff --git a/priv/templates/bin b/priv/templates/bin index dd11707..625f90b 100755 --- a/priv/templates/bin +++ b/priv/templates/bin @@ -11,30 +11,30 @@ REL_DIR="$RELEASE_ROOT_DIR/releases/$REL_VSN" ERL_OPTS="{{ erl_opts }}" find_erts_dir() { - local erts_dir="$RELEASE_ROOT_DIR/erts-$ERTS_VSN" - if [ -d "$erts_dir" ]; then - ERTS_DIR="$erts_dir"; + l_erts_dir="$RELEASE_ROOT_DIR/erts-$ERTS_VSN" + if [ -d "$l_erts_dir" ]; then + ERTS_DIR="$l_erts_dir"; ROOTDIR="$RELEASE_ROOT_DIR" else - local erl="$(which erl)" + l_erl="$(which erl)" code="io:format(\"~s\", [code:root_dir()]), halt()." - local erl_root="$("$erl" -noshell -eval "$code")" - ERTS_DIR="$erl_root/erts-$ERTS_VSN" - ROOTDIR="$erl_root" + l_erl_root="$("$l_erl" -noshell -eval "$code")" + ERTS_DIR="$l_erl_root/erts-$ERTS_VSN" + ROOTDIR="$l_erl_root" fi } find_sys_config() { - local possible_sys="$REL_DIR/sys.config" - if [ -f "$possible_sys" ]; then - SYS_CONFIG="$possible_sys" + l_possible_sys="$REL_DIR/sys.config" + if [ -f "$l_possible_sys" ]; then + SYS_CONFIG="$l_possible_sys" fi } find_vm_args() { - local possible_vm_args="$REL_DIR/vm.args" - if [ -f "$possible_vm_args" ]; then - VM_ARGS="$possible_vm_args" + l_possible_vm_args="$REL_DIR/vm.args" + if [ -f "$l_possible_vm_args" ]; then + VM_ARGS="$l_possible_vm_args" fi } diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin index 452669c..59f46b3 100755 --- a/priv/templates/extended_bin +++ b/priv/templates/extended_bin @@ -13,16 +13,16 @@ ERL_OPTS="{{ erl_opts }}" RUNNER_LOG_DIR="${RUNNER_LOG_DIR:-$RELEASE_ROOT_DIR/log}" find_erts_dir() { - local erts_dir="$RELEASE_ROOT_DIR/erts-$ERTS_VSN" - if [ -d "$erts_dir" ]; then - ERTS_DIR="$erts_dir"; + l_erts_dir="$RELEASE_ROOT_DIR/erts-$ERTS_VSN" + if [ -d "$l_erts_dir" ]; then + ERTS_DIR="$l_erts_dir"; ROOTDIR="$RELEASE_ROOT_DIR" else - local erl="$(which erl)" + l_erl="$(which erl)" code="io:format(\"~s\", [code:root_dir()]), halt()." - local erl_root="$("$erl" -noshell -eval "$code")" - ERTS_DIR="$erl_root/erts-$ERTS_VSN" - ROOTDIR="$erl_root" + l_erl_root="$("$l_erl" -noshell -eval "$code")" + ERTS_DIR="$l_erl_root/erts-$ERTS_VSN" + ROOTDIR="$l_erl_root" fi } @@ -216,7 +216,7 @@ case "$1" in if ! relx_nodetool "stop"; then exit 1 fi - while $(kill -0 "$PID" 2>/dev/null); + while $(kill -s 0 "$PID" 2>/dev/null); do sleep 1 done |