diff options
author | Magnus Feuer <mfeuer@jaguarlandrover.com> | 2016-01-20 17:17:14 -0800 |
---|---|---|
committer | Magnus Feuer <mfeuer@jaguarlandrover.com> | 2016-01-20 17:17:14 -0800 |
commit | f65c595ef7c325c1a2298c720d9343ad915a8dc9 (patch) | |
tree | fa6968b200af6f4e01d2d47d2e73f8141e16449e /scripts | |
parent | bb4ebc8050828e2312b4a3ecd16b21002457b8b9 (diff) | |
parent | 84c9eceebb45284c8932696362108edba596b7b4 (diff) | |
download | rvi_core-f65c595ef7c325c1a2298c720d9343ad915a8dc9.tar.gz |
Merge remote-tracking branch 'upstream/develop' into mfeuer-0.5.0_ubuntu_build
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/rvi.sh | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/scripts/rvi.sh b/scripts/rvi.sh index de8772f..7b69d8d 100755 --- a/scripts/rvi.sh +++ b/scripts/rvi.sh @@ -2,7 +2,7 @@ # # Copyright (C) 2014, Jaguar Land Rover # -# Mozilla Public License, version 2.0. The full text of the +# Mozilla Public License, version 2.0. The full text of the # Mozilla Public License is at https://www.mozilla.org/MPL/2.0/ # # @@ -17,7 +17,7 @@ SELF_DIR=$(dirname $(readlink -f "$0")) ERL=${ERL:=erl} usage() { - echo "Usage: $0 -d config_dir -c config_file -l log_dir \\" + echo "Usage: $0 -d config_dir -c config_file -l log_dir \\" echo " start|stop|console|attach|ping" echo echo " -c config_file Configuration file to launch rvi node with. " @@ -37,7 +37,7 @@ usage() { echo " is the base name of the configuration file." echo echo " console [defaut] Start an rvi in foreground mode." - echo + echo echo " start Start an rvi node with the given configuration file." echo echo " stop Stop an rvi node previously started with 'start'." @@ -136,7 +136,7 @@ then echo "${CONFIG_FILE} cannot be opened for reading." usage fi - # + # # Generate a config file that will end up as # /tmp/rvi/sys.config # @@ -153,7 +153,7 @@ then exit "$?" fi fi - + TMP_DIR=/tmp/rvi/$(basename ${CONFIG_FILE} .config) LOG_DIR=${LOG_DIR:=${TMP_DIR}/rvi/log} @@ -162,7 +162,7 @@ then LOG_DIR=${PWD}/${LOG_DIR} fi -LAUNCH="${ERL} -boot ${CONFIG_DIR}/rvi/start -sname ${SNAME} -config ${CONFIG_DIR}/rvi/sys -setcookie ${COOKIE}" +LAUNCH="${ERL} +A 128 -boot ${CONFIG_DIR}/rvi/start -sname ${SNAME} -config ${CONFIG_DIR}/rvi/sys -setcookie ${COOKIE}" case "${CMD}" in start) @@ -185,9 +185,8 @@ case "${CMD}" in exec ${SELF_DIR}/scripts/nodetool -sname ${SNAME} -setcookie ${COOKIE} ping ;; - attach) + attach) exec to_erl ${TMP_DIR} ;; -esac - +esac |