Another fix for \n in ejabberdctl arguments

This commit is contained in:
Paweł Chmielowski 2016-02-15 15:21:20 +01:00
parent c9c59f00ad
commit d40a091eda
1 changed files with 3 additions and 3 deletions

View File

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