Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Change nodetool path to under releases/<RELEASE_VERSION>/

  • Loading branch information...
commit eafc1bddab7eb26570766fd7aa25f24a02ab10d0 1 parent 65b4800
@shino authored
View
2  priv/templates/simplenode.reltool.config
@@ -31,7 +31,7 @@
{overlay, [
{mkdir, "log/sasl"},
{copy, "files/erl", "\{\{erts_vsn\}\}/bin/erl"},
- {copy, "files/nodetool", "\{\{erts_vsn\}\}/bin/nodetool"},
+ {copy, "files/nodetool", "releases/\{\{rel_vsn\}\}/nodetool"},
{copy, "files/{{nodeid}}", "bin/{{nodeid}}"},
{copy, "files/{{nodeid}}.cmd", "bin/{{nodeid}}.cmd"},
{copy, "files/start_erl.cmd", "bin/start_erl.cmd"},
View
13 priv/templates/simplenode.runner
@@ -109,13 +109,15 @@ if [ -e "$RUNNER_BASE_DIR/releases/$APP_VSN/runner_script.data" ]; then
fi
if [ -z "$RUNNER_SCRIPT_DATA" ]; then
- echo "normal release"
ROOTDIR=$RUNNER_BASE_DIR
ERTS_PATH=$RUNNER_BASE_DIR/erts-$ERTS_VSN/bin
- NODETOOL="$ERTS_PATH/escript $ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG"
+ if [ -e "$RUNNER_BASE_DIR/releases/$APP_VSN/nodetool" ]; then
+ NODETOOL="$ERTS_PATH/escript $RUNNER_BASE_DIR/releases/$APP_VSN/nodetool $NAME_ARG $COOKIE_ARG"
+ else
+ NODETOOL="$ERTS_PATH/escript $ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG"
+ fi
SLIM_ARGS=
elif [ "$RUNNER_SCRIPT_DATA" = "slim" ]; then
- echo "slim release"
# Setup system paths
SYSTEM_ERL_PATH=`which erl`
if [ ! -x "$SYSTEM_ERL_PATH" ]; then
@@ -128,15 +130,14 @@ elif [ "$RUNNER_SCRIPT_DATA" = "slim" ]; then
unset SYSTEM_ERL_PATH
unset SYSTEM_HOME_BIN
- # Setup nodetool path. Is it nice to place nodetool script under releases?
LOCAL_ERTS_PATH=$RUNNER_BASE_DIR/erts-$ERTS_VSN/bin
- NODETOOL="$ERTS_PATH/escript $LOCAL_ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG"
+ NODETOOL="$ERTS_PATH/escript $RUNNER_BASE_DIR/releases/$APP_VSN/nodetool $NAME_ARG $COOKIE_ARG"
unset LOCAL_ERL_PATH
# Setup additional arguments for slim release
SLIM_ARGS="-boot_var RELTOOL_EXT_LIB $RUNNER_BASE_DIR/lib -sasl releases_dir \"$RUNNER_BASE_DIR/releases\""
else
- echo "unknown runner_script.data"
+ echo "Unknown runner_script.data"
exit 1
fi
Please sign in to comment.
Something went wrong with that request. Please try again.