From cf5ed973dbfadd5edcc1d7d9e7ddcfcc202769df Mon Sep 17 00:00:00 2001 From: Jared Morrow Date: Tue, 23 Jun 2015 08:32:34 -0600 Subject: Remove bashisms from run scripts This commit removes the bashisms in `bin` and `extended_bin`. Both of these scripts used `local` variables which are a bash addition and aren't supported on Solaris/SmartOS /bin/sh. To keep the local intention of the variables, they were renamed from $var to $l_var. In addition, `extended_bin` used `kill -SIGNAL $PID` which is also not in Solaris `kill`. --- priv/templates/extended_bin | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'priv/templates/extended_bin') 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 -- cgit v1.2.3