]> granicus.if.org Git - ejabberd/commitdiff
Another fix for \n in ejabberdctl arguments
authorPaweł Chmielowski <pchmielowski@process-one.net>
Mon, 15 Feb 2016 14:21:20 +0000 (15:21 +0100)
committerPaweł Chmielowski <pchmielowski@process-one.net>
Mon, 15 Feb 2016 14:21:27 +0000 (15:21 +0100)
ejabberdctl.template

index 0d1a642923abaa62ae53b4a1bcc24545662282fe..07395aafdd183a0c789b91a8e7430bdbd8c6f8ff 100755 (executable)
@@ -31,14 +31,14 @@ if [ "$INSTALLUSER" != "" ] ; then
         fi
     done
     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
-        EXEC_CMD="sh -c"
+        EXEC_CMD="bash -c"
     fi
     if [ "$EXEC_CMD" = "false" ] ; then
         echo "This command can only be run by root or the user $INSTALLUSER" >&2
         exit 4
     fi
 else
-    EXEC_CMD="sh -c"
+    EXEC_CMD="bash -c"
 fi
 
 # parse command line parameters
@@ -166,7 +166,7 @@ shell_escape()
         if test -z "$i"; then
             printf '"" '
         else
-            printf '"%q" ' "$i" | sed 's/\\\\n/\n/g;s/\\\\t/\t/g;s/\\\\r/\r/g'
+            printf '%q ' "$i"
         fi
     done
 }