summaryrefslogtreecommitdiff
path: root/test/upgrade_project/rel/files/dummy
diff options
context:
space:
mode:
authorAlexey Romanov <alexey.v.romanov@gmail.com>2011-03-05 14:11:31 +0300
committerAlexey Romanov <alexey.v.romanov@gmail.com>2011-03-05 14:11:31 +0300
commit7c40d624dc344e534c7b576341463648091f56e8 (patch)
tree4b384980bd6fe327cdecf25c55a6dd2622cd8412 /test/upgrade_project/rel/files/dummy
parent48d23b90acb688a68354b20a1b19fa0aa0e592be (diff)
parent25c0226ab94560c5e182944c4c71b9f71ac3f08e (diff)
Merge commit 'upstream/master'
Diffstat (limited to 'test/upgrade_project/rel/files/dummy')
-rwxr-xr-xtest/upgrade_project/rel/files/dummy6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/upgrade_project/rel/files/dummy b/test/upgrade_project/rel/files/dummy
index ec6d7ff..43dce0f 100755
--- a/test/upgrade_project/rel/files/dummy
+++ b/test/upgrade_project/rel/files/dummy
@@ -7,6 +7,7 @@ RUNNER_SCRIPT_DIR=$(cd ${0%/*} && pwd)
RUNNER_BASE_DIR=${RUNNER_SCRIPT_DIR%/*}
RUNNER_ETC_DIR=$RUNNER_BASE_DIR/etc
RUNNER_LOG_DIR=$RUNNER_BASE_DIR/log
+# Note the trailing slash on $PIPE_DIR/
PIPE_DIR=/tmp/$RUNNER_BASE_DIR/
RUNNER_USER=
@@ -61,8 +62,7 @@ case "$1" in
HEART_COMMAND="$RUNNER_BASE_DIR/bin/$SCRIPT start"
export HEART_COMMAND
mkdir -p $PIPE_DIR
- # Note the trailing slash on $PIPE_DIR/
- $ERTS_PATH/run_erl -daemon $PIPE_DIR/ $RUNNER_LOG_DIR "exec $RUNNER_BASE_DIR/bin/$SCRIPT console" 2>&1
+ $ERTS_PATH/run_erl -daemon $PIPE_DIR $RUNNER_LOG_DIR "exec $RUNNER_BASE_DIR/bin/$SCRIPT console" 2>&1
;;
stop)
@@ -147,7 +147,7 @@ case "$1" in
;;
*)
- echo "Usage: $SCRIPT {start|stop|restart|reboot|ping|console|attach}"
+ echo "Usage: $SCRIPT {start|stop|restart|reboot|ping|console|console_clean|attach}"
exit 1
;;
esac