Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

Fix escaping of argument in iexlive and iexdebug

Browse Source
This commit is contained in:
Paweł Chmielowski 2016-03-09 14:25:57 +01:00
parent e31799a3b1
commit 842d52352a
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ejabberdctl.template
View File

@ -159,6 +159,15 @@ export CONTRIB_MODULES_PATH
export CONTRIB_MODULES_CONF_DIR export CONTRIB_MODULES_CONF_DIR
export ERL_LIBS export ERL_LIBS
shell_escape_str()
{
if test $# -eq 0; then
printf '"" '
else
shell_escape "$@"
fi
}
shell_escape() shell_escape()
{ {
local RES=() local RES=()
@ -208,10 +217,10 @@ iexdebug()
# Elixir shell is hidden as default # Elixir shell is hidden as default
CMD="`shell_escape \"$IEX\" \"$IEXNAME\" \"debug-${TTY}-${ERLANG_NODE}\"` \ CMD="`shell_escape \"$IEX\" \"$IEXNAME\" \"debug-${TTY}-${ERLANG_NODE}\"` \
-remsh $ERLANG_NODE \ -remsh $ERLANG_NODE \
--erl \"`shell_escape \"$KERNEL_OPTS\"\" \ --erl `shell_escape \"$KERNEL_OPTS\"` \
--erl \"`shell_escape \"$ERLANG_OPTS\"\" \ --erl `shell_escape \"$ERLANG_OPTS\"` \
--erl \"`shell_escape \"${ARGS[@]}\"\" \ --erl `shell_escape \"${ARGS[@]}\"` \
--erl \"`shell_escape \"$@\"\"" --erl `shell_escape_str \"$@\"`"
$EXEC_CMD "$CMD" $EXEC_CMD "$CMD"
} }
@ -233,14 +242,15 @@ live()
iexlive() iexlive()
{ {
livewarning livewarning
echo $@
CMD="`shell_escape \"$IEX\" \"$IEXNAME\" \"${ERLANG_NODE}\"` \ CMD="`shell_escape \"$IEX\" \"$IEXNAME\" \"${ERLANG_NODE}\"` \
--erl \"-mnesia dir \\\"$SPOOL_DIR\\\"\" \ --erl \"-mnesia dir \\\"$SPOOL_DIR\\\"\" \
--erl \"`shell_escape \"$KERNEL_OPTS\"`\" \ --erl \"`shell_escape \"$KERNEL_OPTS\"`\" \
--erl \"`shell_escape \"$EJABBERD_OPTS\"`\" \ --erl \"`shell_escape \"$EJABBERD_OPTS\"`\" \
--app ejabberd \ --app ejabberd \
--erl \"`shell_escape \"$ERLANG_OPTS\"`\" \ --erl `shell_escape \"$ERLANG_OPTS\"` \
--erl \"`shell_escape \"${ARGS[@]}\"`\" \ --erl `shell_escape \"${ARGS[@]}\"` \
--erl \"`shell_escape \"$@\"`\"" --erl `shell_escape_str \"$@\"`"
$EXEC_CMD "$CMD" $EXEC_CMD "$CMD"
} }