diff options
| author | Simon Klassen <6997477+sklassen@users.noreply.github.com> | 2020-04-23 04:14:25 +0800 |
|---|---|---|
| committer | Joan Touzet <joant@atypical.net> | 2020-04-22 16:15:39 -0400 |
| commit | db4afbd5f1f93ed986c48526f0a0cb766cbfc9af (patch) | |
| tree | e85e929efeb672bbc2d620805e0530efc6dcf662 | |
| parent | b476e19544e16f32a272fd17663c98109256a890 (diff) | |
| download | couchdb-remsh-improvement-3.0.x.tar.gz | |
Replace VM_ARGS with ARGS_FILE which is set as it is in couchdb script /etc/vm.args; also parses name from config. (#2738)archive/remsh-improvement-3.0.xremsh-improvement-3.0.x
Co-authored-by: sklassen <none>
Co-authored-by: Joan Touzet <wohali@users.noreply.github.com>
| -rwxr-xr-x | rel/overlay/bin/remsh | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/rel/overlay/bin/remsh b/rel/overlay/bin/remsh index c5e932a8d..d1fcdd95f 100755 --- a/rel/overlay/bin/remsh +++ b/rel/overlay/bin/remsh @@ -32,17 +32,28 @@ BINDIR=$ROOTDIR/erts-$ERTS_VSN/bin PROGNAME=${0##*/} VERBOSE="" -NODE="couchdb@127.0.0.1" +DEFAULT_NODE="couchdb@127.0.0.1" LHOST=127.0.0.1 -VM_ARGS=$COUCHDB_BIN_DIR/../etc/vm.args + +ARGS_FILE="${COUCHDB_ARGS_FILE:-$ROOTDIR/etc/vm.args}" + +# If present, extract cookie from ERL_FLAGS +# This is used by the CouchDB Dockerfile and Helm chart +NODE=$(echo "$ERL_FLAGS" | sed 's/^.*name \([^ ][^ ]*\).*$/\1/g') +if test -f "$ARGS_FILE"; then +# else attempt to extract from vm.args + ARGS_FILE_COOKIE=$(awk '$1=="-name"{print $2}' "$ARGS_FILE") + NODE="${NODE:-$ARGS_FILE_COOKIE}" +fi +NODE="${NODE:-$DEFAULT_NODE}" # If present, extract cookie from ERL_FLAGS # This is used by the CouchDB Dockerfile and Helm chart COOKIE=$(echo "$ERL_FLAGS" | sed 's/^.*setcookie \([^ ][^ ]*\).*$/\1/g') -if test -f "$VM_ARGS"; then +if test -f "$ARGS_FILE"; then # else attempt to extract from vm.args - VM_ARGS_COOKIE=$(awk '$1=="-setcookie"{print $2}' "$VM_ARGS") - COOKIE="${COOKIE:-$VM_ARGS_COOKIE}" + ARGS_FILE_COOKIE=$(awk '$1=="-setcookie"{print $2}' "$ARGS_FILE") + COOKIE="${COOKIE:-$ARGS_FILE_COOKIE}" fi COOKIE="${COOKIE:-monster}" |