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
2.0.x
Jérôme Sautret 14 years ago
parent 48095baeaf
commit 410cdc3c5c
  1. 20
      tools/ejabberdctl

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

Loading…
Cancel
Save