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

ejabberdctl: Call erl without -pa argument

The path to ejabberd's ebin directories is now specified by setting the
ERL_LIBS variable.
This commit is contained in:
Holger Weiss 2016-01-03 23:35:41 +01:00
parent 5deb6a91f7
commit fc013442bb

View File

@ -167,7 +167,6 @@ start()
$EXEC_CMD "$ERL \ $EXEC_CMD "$ERL \
$NAME $ERLANG_NODE \ $NAME $ERLANG_NODE \
-noinput -detached \ -noinput -detached \
-pa $EJABBERD_EBIN_PATH \
$MNESIA_OPTS \ $MNESIA_OPTS \
$KERNEL_OPTS \ $KERNEL_OPTS \
$EJABBERD_OPTS \ $EJABBERD_OPTS \
@ -207,7 +206,6 @@ live()
livewarning livewarning
$EXEC_CMD "$ERL \ $EXEC_CMD "$ERL \
$NAME $ERLANG_NODE \ $NAME $ERLANG_NODE \
-pa $EJABBERD_EBIN_PATH \
$MNESIA_OPTS \ $MNESIA_OPTS \
$KERNEL_OPTS \ $KERNEL_OPTS \
$EJABBERD_OPTS \ $EJABBERD_OPTS \
@ -221,7 +219,6 @@ iexlive()
livewarning livewarning
$EXEC_CMD "$IEX \ $EXEC_CMD "$IEX \
$IEXNAME $ERLANG_NODE \ $IEXNAME $ERLANG_NODE \
-pa $EJABBERD_EBIN_PATH \
--erl \"-mnesia dir \\\"$SPOOL_DIR\\\"\" \ --erl \"-mnesia dir \\\"$SPOOL_DIR\\\"\" \
--erl \"$KERNEL_OPTS\" \ --erl \"$KERNEL_OPTS\" \
--erl \"$EJABBERD_OPTS\" \ --erl \"$EJABBERD_OPTS\" \
@ -236,7 +233,6 @@ foreground()
$EXEC_CMD "$ERL \ $EXEC_CMD "$ERL \
$NAME $ERLANG_NODE \ $NAME $ERLANG_NODE \
-noinput \ -noinput \
-pa $EJABBERD_EBIN_PATH \
$MNESIA_OPTS \ $MNESIA_OPTS \
$KERNEL_OPTS \ $KERNEL_OPTS \
$EJABBERD_OPTS \ $EJABBERD_OPTS \
@ -306,7 +302,6 @@ ping()
$EXEC_CMD "$ERL \ $EXEC_CMD "$ERL \
$NAME ping-${TTY}-${ERLANG_NODE} \ $NAME ping-${TTY}-${ERLANG_NODE} \
-hidden \ -hidden \
-pa $EJABBERD_EBIN_PATH \
$KERNEL_OPTS $ERLANG_OPTS \ $KERNEL_OPTS $ERLANG_OPTS \
-eval 'io:format(\"~p~n\",[net_adm:ping($1)])' \ -eval 'io:format(\"~p~n\",[net_adm:ping($1)])' \
-s erlang halt -output text -noinput" -s erlang halt -output text -noinput"
@ -417,7 +412,6 @@ ctlexec()
$NAME ${CONN_NAME} \ $NAME ${CONN_NAME} \
-noinput \ -noinput \
-hidden \ -hidden \
-pa $EJABBERD_EBIN_PATH \
$KERNEL_OPTS \ $KERNEL_OPTS \
-s ejabberd_ctl -extra $ERLANG_NODE $EJABBERD_NO_TIMEOUT $COMMAND" -s ejabberd_ctl -extra $ERLANG_NODE $EJABBERD_NO_TIMEOUT $COMMAND"
} }