From 12e030ac8a2f30fc8dc1a1c04f90568778edd914 Mon Sep 17 00:00:00 2001 From: soranoba Date: Wed, 15 Jun 2016 20:23:17 +0900 Subject: If cookie is not exist in vm.args, it use the cookie in ~/.erlang.cookie --- priv/templates/extended_bin | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin index c2515ba..811a8bb 100755 --- a/priv/templates/extended_bin +++ b/priv/templates/extended_bin @@ -163,14 +163,22 @@ PIPE_DIR="${PIPE_DIR:-/tmp/erl_pipes/$NAME/}" # Extract the target cookie COOKIE_ARG="$(grep '^-setcookie' "$VMARGS_PATH" || true)" +DEFAULT_COOKIE_FILE="$HOME/.erlang.cookie" if [ -z "$COOKIE_ARG" ]; then - echo "vm.args needs to have a -setcookie parameter." - exit 1 + if [ ! -f "$DEFAULT_COOKIE_FILE" ]; then + echo "vm.args needs to have a -setcookie, or $DEFAULT_COOKIE_FILE is required." + exit 1 + elif [ -O "$DEFAULT_COOKIE_FILE" ] && [ $(stat --format=%a $DEFAULT_COOKIE_FILE) -eq 400 ]; then + COOKIE="$(cat $DEFAULT_COOKIE_FILE)" + else + echo "$DEFAULT_COOKIE_FILE must be set to octal 400. (read-only by user)" + exit 1 + fi +else + # Extract cookie name from COOKIE_ARG + COOKIE="$(echo "$COOKIE_ARG" | awk '{print $2}')" fi -# Extract cookie name from COOKIE_ARG -COOKIE="$(echo "$COOKIE_ARG" | awk '{print $2}')" - find_erts_dir export ROOTDIR="$RELEASE_ROOT_DIR" export BINDIR="$ERTS_DIR/bin" -- cgit v1.2.3 From 7de3ed18361decc9ca3c1c0fe95b4f40a149154c Mon Sep 17 00:00:00 2001 From: soranoba Date: Fri, 17 Jun 2016 01:06:30 +0900 Subject: Remove a non-POSIX command. --- priv/templates/extended_bin | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin index 811a8bb..7a9f0c7 100755 --- a/priv/templates/extended_bin +++ b/priv/templates/extended_bin @@ -165,13 +165,10 @@ PIPE_DIR="${PIPE_DIR:-/tmp/erl_pipes/$NAME/}" COOKIE_ARG="$(grep '^-setcookie' "$VMARGS_PATH" || true)" DEFAULT_COOKIE_FILE="$HOME/.erlang.cookie" if [ -z "$COOKIE_ARG" ]; then - if [ ! -f "$DEFAULT_COOKIE_FILE" ]; then - echo "vm.args needs to have a -setcookie, or $DEFAULT_COOKIE_FILE is required." - exit 1 - elif [ -O "$DEFAULT_COOKIE_FILE" ] && [ $(stat --format=%a $DEFAULT_COOKIE_FILE) -eq 400 ]; then + if [ -f "$DEFAULT_COOKIE_FILE" ]; then COOKIE="$(cat $DEFAULT_COOKIE_FILE)" else - echo "$DEFAULT_COOKIE_FILE must be set to octal 400. (read-only by user)" + echo "vm.args needs to have a -setcookie, or $DEFAULT_COOKIE_FILE (its permission must be 400) is required." exit 1 fi else -- cgit v1.2.3