Merge pull request #1328 from mluto/run-sh-root-argument

Added --root argument to run.sh to bypass the root-check, fix for #1324
This commit is contained in:
John McLear 2013-01-14 08:14:13 -08:00
commit 025c92f346

View file

@ -8,10 +8,18 @@ if [ -d "../bin" ]; then
cd "../" cd "../"
fi fi
ignoreRoot=0
for ARG in $*
do
if [ $ARG == '--root' ]; then
ignoreRoot=1
fi
done
#Stop the script if its started as root #Stop the script if its started as root
if [ "$(id -u)" -eq 0 ]; then if [ "$(id -u)" -eq 0 ] && [ $ignoreRoot -eq 0 ]; then
echo "You shouldn't start Etherpad-Lite as root!" echo "You shouldn't start Etherpad-Lite as root!"
echo "Please type 'Etherpad Lite rocks my socks' if you still want to start it as root" echo "Please type 'Etherpad Lite rocks my socks' or supply the '--root' argument if you still want to start it as root"
read rocks read rocks
if [ ! $rocks = "Etherpad Lite rocks my socks" ] if [ ! $rocks = "Etherpad Lite rocks my socks" ]
then then