25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00

Backport r2422 and r2423 from trunk:

* tools/ejabberdctl: fix shell function syntax (EJAB-1003).
* tools/ejabberdctl: use a variable for Erlang shell.
* tools/ejabberdctl: cosmetic change.

SVN Revision: 2424
This commit is contained in:
Jérôme Sautret 2009-08-06 09:55:35 +00:00
parent 48095baeaf
commit 410cdc3c5c

View File

@ -4,6 +4,7 @@ NODE=ejabberd
HOST=localhost HOST=localhost
# Define ejabberd environment # Define ejabberd environment
ERL=erl
here=`which "$0" 2>/dev/null || echo .` here=`which "$0" 2>/dev/null || echo .`
base="`dirname $here`/.." base="`dirname $here`/.."
ROOTDIR=`(cd "$base"; echo $PWD)` ROOTDIR=`(cd "$base"; echo $PWD)`
@ -20,9 +21,9 @@ export ERL_MAX_PORTS=32000
[ -d $EJABBERD_DB ] || mkdir -p $EJABBERD_DB [ -d $EJABBERD_DB ] || mkdir -p $EJABBERD_DB
[ -f $EJABBERD_CONFIG_PATH ] || cp $ROOTDIR/src/ejabberd.cfg.example $EJABBERD_CONFIG_PATH [ -f $EJABBERD_CONFIG_PATH ] || cp $ROOTDIR/src/ejabberd.cfg.example $EJABBERD_CONFIG_PATH
function start start()
{ {
erl \ $ERL \
-noinput -detached \ -noinput -detached \
-sname $NODE@$HOST \ -sname $NODE@$HOST \
-pa $EJABBERD_EBIN \ -pa $EJABBERD_EBIN \
@ -33,25 +34,25 @@ function start
-sasl sasl_error_logger \{file,\"$SASL_LOG_PATH\"\} -sasl sasl_error_logger \{file,\"$SASL_LOG_PATH\"\}
} }
function debug debug()
{ {
erl \ $ERL \
-sname debug$NODE@$HOST \ -sname debug$NODE@$HOST \
-pa $EJABBERD_EBIN \ -pa $EJABBERD_EBIN \
-mnesia dir "\"$EJABBERD_DB\"" \ -mnesia dir "\"$EJABBERD_DB\"" \
-remsh $NODE@$HOST -remsh $NODE@$HOST
} }
function ctl ctl()
{ {
erl \ $ERL \
-noinput \ -sname ctl$NODE@$HOST \
-sname ejabberdctl@$HOST \
-pa $EJABBERD_EBIN \ -pa $EJABBERD_EBIN \
-noinput \
-s ejabberd_ctl -extra $NODE@$HOST $@ -s ejabberd_ctl -extra $NODE@$HOST $@
} }
function usage usage()
{ {
ctl ctl
exit exit
@ -64,4 +65,3 @@ case $1 in
debug) debug;; debug) debug;;
*) ctl $@;; *) ctl $@;;
esac esac