diff options
| author | Paweł Chmielowski <pchmielowski@process-one.net> | 2016-03-09 14:25:57 +0100 |
|---|---|---|
| committer | Paweł Chmielowski <pchmielowski@process-one.net> | 2016-03-09 14:26:28 +0100 |
| commit | 842d52352a52e504e9be858302443252b7cf07d4 (patch) | |
| tree | 02bd160748c5294f056c837447d3e79e84adc670 /ejabberdctl.template | |
| parent | Define mod_opt_type/1 callback (diff) | |
Fix escaping of argument in iexlive and iexdebug
Diffstat (limited to 'ejabberdctl.template')
| -rwxr-xr-x | ejabberdctl.template | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/ejabberdctl.template b/ejabberdctl.template index 07395aaf..aa9c2eb8 100755 --- a/ejabberdctl.template +++ b/ejabberdctl.template @@ -159,6 +159,15 @@ export CONTRIB_MODULES_PATH export CONTRIB_MODULES_CONF_DIR export ERL_LIBS +shell_escape_str() +{ + if test $# -eq 0; then + printf '"" ' + else + shell_escape "$@" + fi +} + shell_escape() { local RES=() @@ -208,10 +217,10 @@ iexdebug() # Elixir shell is hidden as default CMD="`shell_escape \"$IEX\" \"$IEXNAME\" \"debug-${TTY}-${ERLANG_NODE}\"` \ -remsh $ERLANG_NODE \ - --erl \"`shell_escape \"$KERNEL_OPTS\"\" \ - --erl \"`shell_escape \"$ERLANG_OPTS\"\" \ - --erl \"`shell_escape \"${ARGS[@]}\"\" \ - --erl \"`shell_escape \"$@\"\"" + --erl `shell_escape \"$KERNEL_OPTS\"` \ + --erl `shell_escape \"$ERLANG_OPTS\"` \ + --erl `shell_escape \"${ARGS[@]}\"` \ + --erl `shell_escape_str \"$@\"`" $EXEC_CMD "$CMD" } @@ -233,14 +242,15 @@ live() iexlive() { livewarning + echo $@ CMD="`shell_escape \"$IEX\" \"$IEXNAME\" \"${ERLANG_NODE}\"` \ --erl \"-mnesia dir \\\"$SPOOL_DIR\\\"\" \ --erl \"`shell_escape \"$KERNEL_OPTS\"`\" \ --erl \"`shell_escape \"$EJABBERD_OPTS\"`\" \ --app ejabberd \ - --erl \"`shell_escape \"$ERLANG_OPTS\"`\" \ - --erl \"`shell_escape \"${ARGS[@]}\"`\" \ - --erl \"`shell_escape \"$@\"`\"" + --erl `shell_escape \"$ERLANG_OPTS\"` \ + --erl `shell_escape \"${ARGS[@]}\"` \ + --erl `shell_escape_str \"$@\"`" $EXEC_CMD "$CMD" } |