Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Flexible release cookie #809

Merged
merged 7 commits into from
Aug 22, 2020
Merged

Flexible release cookie #809

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
731bd1c
First cookie fix: do not poll the VM if not having start/stop hooks t…
Olivier-Boudeville Aug 11, 2020
d1bca5e
Second cookie fix: accept any ERLX_OVERRIDE_COOKIE environment variab…
Olivier-Boudeville Aug 11, 2020
155a968
No need to introduce ERLX_OVERRIDE_COOKIE, as the COOKIE variable is …
Olivier-Boudeville Aug 11, 2020
0be3b94
Commit 731bd1cadd38736fa90118178dbb64e618531cb4 mostly reverted: appa…
Olivier-Boudeville Aug 11, 2020
ad37eef
Minimised differences with upstream.
Olivier-Boudeville Aug 16, 2020
21a75c2
ERLX_COOKIE preferred to COOKIE.
Olivier-Boudeville Aug 21, 2020
476fdc9
Managed to mispell RELX.
Olivier-Boudeville Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions priv/templates/extended_bin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,17 +647,21 @@ fi

# Extract the target cookie
# Do this before relx_get_nodename so we can use it and not create a ~/.erlang.cookie
COOKIE_ARG="$(grep '^-setcookie' "$VMARGS_PATH" || true)"
DEFAULT_COOKIE_FILE="$HOME/.erlang.cookie"
if [ -z "$COOKIE_ARG" ]; then
if [ -f "$DEFAULT_COOKIE_FILE" ]; then
COOKIE="$(cat "$DEFAULT_COOKIE_FILE")"
if [ -n "$RELX_COOKIE" ]; then
COOKIE="$RELX_COOKIE"
else
COOKIE_ARG="$(grep '^-setcookie' "$VMARGS_PATH" || true)"
DEFAULT_COOKIE_FILE="$HOME/.erlang.cookie"
if [ -z "$COOKIE_ARG" ]; then
if [ -f "$DEFAULT_COOKIE_FILE" ]; then
COOKIE="$(cat "$DEFAULT_COOKIE_FILE")"
else
echo "No cookie is set or found. This limits the scripts functionality, installing, upgrading, rpc and getting a list of versions will not work."
fi
else
echo "No cookie is set or found. This limits the scripts functionality, installing, upgrading, rpc and getting a list of versions will not work."
# Extract cookie name from COOKIE_ARG
COOKIE="$(echo "$COOKIE_ARG" | awk '{print $2}')"
fi
else
# Extract cookie name from COOKIE_ARG
COOKIE="$(echo "$COOKIE_ARG" | awk '{print $2}')"
fi

# User can specify an sname without @hostname
Expand Down