From: Christophe Romain <christophe.romain@process-one.net>
Date: Wed, 28 Jun 2017 09:39:05 +0000 (+0200)
Subject: Quote paths to allow spaces (#1789)
X-Git-Tag: 17.06~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f12804a49270b5a67d6d20ea778a84273cb53b7;p=ejabberd

Quote paths to allow spaces (#1789)
---

diff --git a/ejabberdctl.template b/ejabberdctl.template
index 26719cc26..9099bd3dd 100755
--- a/ejabberdctl.template
+++ b/ejabberdctl.template
@@ -10,9 +10,9 @@ FIREWALL_WINDOW=""
 ERLANG_NODE=ejabberd@localhost
 
 # define default environment variables
-ERL={{erl}}
-IEX={{bindir}}/iex
-EPMD={{epmd}}
+ERL="{{erl}}"
+IEX="{{bindir}}/iex"
+EPMD="{{epmd}}"
 INSTALLUSER={{installuser}}
 
 # check the proper system user is used if defined
@@ -110,12 +110,12 @@ exec_cmd()
 exec_erl()
 {
     NODE=$1; shift
-    exec_cmd $ERL ${S:--}name $NODE $ERLANG_OPTS "$@"
+    exec_cmd "$ERL" ${S:--}name $NODE $ERLANG_OPTS "$@"
 }
 exec_iex()
 {
     NODE=$1; shift
-    exec_cmd $IEX ${S:---}name $NODE --erl "$ERLANG_OPTS" "$@"
+    exec_cmd "$IEX" ${S:---}name $NODE --erl "$ERLANG_OPTS" "$@"
 }
 
 # usage
@@ -287,7 +287,7 @@ case $1 in
     ping)
         PEER=${2:-$ERLANG_NODE}
         [ "$PEER" = "${PEER%.*}" ] && PS="-s"
-        exec_cmd $ERL ${PS:--}name $(uid ping $(hostname $PS)) $ERLANG_OPTS \
+        exec_cmd "$ERL" ${PS:--}name $(uid ping $(hostname $PS)) $ERLANG_OPTS \
                  -noinput -hidden -eval 'io:format("~p~n",[net_adm:ping('"$PEER"')])' \
                  -s erlang halt -output text
         ;;