diff options
| author | Tristan Sloughter <[email protected]> | 2015-10-05 14:37:09 -0500 |
|---|---|---|
| committer | Tristan Sloughter <[email protected]> | 2015-10-05 14:37:09 -0500 |
| commit | 7eb43d4f1ba21f3fe0ee7dd37783fb05ce855fb3 (patch) | |
| tree | c63973f86c9625f9e95df635c866ab49e618132c | |
| parent | 3f0a7246ab43be07e58ee802a142399dac9e6055 (diff) | |
| parent | d9898fe63a934f15d079e3355d7dd8d93208ed0d (diff) | |
| download | relx-7eb43d4f1ba21f3fe0ee7dd37783fb05ce855fb3.tar.gz relx-7eb43d4f1ba21f3fe0ee7dd37783fb05ce855fb3.tar.bz2 relx-7eb43d4f1ba21f3fe0ee7dd37783fb05ce855fb3.zip | |
Merge pull request #403 from artygus/master
continue extended_bin script execution after VMARGS checks
| -rwxr-xr-x | priv/templates/extended_bin | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin index f7955cb..7c9f159 100755 --- a/priv/templates/extended_bin +++ b/priv/templates/extended_bin @@ -121,7 +121,7 @@ if [ $RELX_REPLACE_OS_VARS ]; then fi # Extract the target node name from node.args -NAME_ARG=$(egrep '^-s?name' "$VMARGS_PATH") +NAME_ARG=$(egrep '^-s?name' "$VMARGS_PATH" || true) if [ -z "$NAME_ARG" ]; then echo "vm.args needs to have either -name or -sname parameter." exit 1 @@ -134,7 +134,7 @@ NAME="$(echo "$NAME_ARG" | awk '{print $2}')" PIPE_DIR="${PIPE_DIR:-/tmp/erl_pipes/$NAME/}" # Extract the target cookie -COOKIE_ARG="$(grep '^-setcookie' "$VMARGS_PATH")" +COOKIE_ARG="$(grep '^-setcookie' "$VMARGS_PATH" || true)" if [ -z "$COOKIE_ARG" ]; then echo "vm.args needs to have a -setcookie parameter." exit 1 |