github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2024-11-23 19:19:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change nodetool path to under releases/<RELEASE_VERSION>/

Browse source
This commit is contained in:
Shunichi Shinohara 2013-01-13 21:11:52 +09:00
parent 2575bb24da
commit e4300bf88f
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
priv/templates/simplenode.reltool.config
View file

@ -32,7 +32,7 @@
{overlay, [ {overlay, [
{mkdir, "log/sasl"}, {mkdir, "log/sasl"},
{copy, "files/erl", "\{\{erts_vsn\}\}/bin/erl"}, {copy, "files/erl", "\{\{erts_vsn\}\}/bin/erl"},
{copy, "files/nodetool", "\{\{erts_vsn\}\}/bin/nodetool"}, {copy, "files/nodetool", "releases/\{\{rel_vsn\}\}/nodetool"},
{copy, "{{nodeid}}/bin/start_clean.boot", {copy, "{{nodeid}}/bin/start_clean.boot",
"\{\{erts_vsn\}\}/bin/start_clean.boot"}, "\{\{erts_vsn\}\}/bin/start_clean.boot"},
{copy, "files/{{nodeid}}", "bin/{{nodeid}}"}, {copy, "files/{{nodeid}}", "bin/{{nodeid}}"},

13
priv/templates/simplenode.runner
View file

@ -136,13 +136,15 @@ if [ -e "$RUNNER_BASE_DIR/releases/$APP_VSN/runner_script.data" ]; then
fi fi
if [ -z "$RUNNER_SCRIPT_DATA" ]; then if [ -z "$RUNNER_SCRIPT_DATA" ]; then
echo "normal release"
ROOTDIR=$RUNNER_BASE_DIR ROOTDIR=$RUNNER_BASE_DIR
ERTS_PATH=$RUNNER_BASE_DIR/erts-$ERTS_VSN/bin 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= SLIM_ARGS=
elif [ "$RUNNER_SCRIPT_DATA" = "slim" ]; then elif [ "$RUNNER_SCRIPT_DATA" = "slim" ]; then
echo "slim release"
# Setup system paths # Setup system paths
SYSTEM_ERL_PATH=`which erl` SYSTEM_ERL_PATH=`which erl`
if [ ! -x "$SYSTEM_ERL_PATH" ]; then if [ ! -x "$SYSTEM_ERL_PATH" ]; then
@ -155,15 +157,14 @@ elif [ "$RUNNER_SCRIPT_DATA" = "slim" ]; then
unset SYSTEM_ERL_PATH unset SYSTEM_ERL_PATH
unset SYSTEM_HOME_BIN 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 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 unset LOCAL_ERL_PATH
# Setup additional arguments for slim release # Setup additional arguments for slim release
SLIM_ARGS="-boot_var RELTOOL_EXT_LIB $RUNNER_BASE_DIR/lib -sasl releases_dir \"$RUNNER_BASE_DIR/releases\"" SLIM_ARGS="-boot_var RELTOOL_EXT_LIB $RUNNER_BASE_DIR/lib -sasl releases_dir \"$RUNNER_BASE_DIR/releases\""
else else
echo "unknown runner_script.data" echo "Unknown runner_script.data"
exit 1 exit 1
fi fi