From 155a9680c45549b43920ba8d6c0f4f60f73c6c1e Mon Sep 17 00:00:00 2001 From: Olivier Boudeville Date: Tue, 11 Aug 2020 15:30:17 +0200 Subject: [PATCH] No need to introduce ERLX_OVERRIDE_COOKIE, as the COOKIE variable is already taken into account. Yet it was shadowed if any -setcookie was set on the command-line, which is not the case anymore. --- priv/templates/extended_bin | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin index c98ef1cb8..f3e1d82be 100755 --- a/priv/templates/extended_bin +++ b/priv/templates/extended_bin @@ -647,9 +647,7 @@ fi # Extract the target cookie # Do this before relx_get_nodename so we can use it and not create a ~/.erlang.cookie -if [ -n "$ERLX_OVERRIDE_COOKIE" ]; then - COOKIE="$ERLX_OVERRIDE_COOKIE" -else +if [ -z "$COOKIE" ]; then COOKIE_ARG="$(grep '^-setcookie' "$VMARGS_PATH" || true)" DEFAULT_COOKIE_FILE="$HOME/.erlang.cookie" if [ -z "$COOKIE_ARG" ]; then