Merge remote-tracking branch 'origin/master' into 2.4

# Conflicts:
#	web/wallassets/baggy.js
#	web/wallassets/manifest.json
#	web/wallassets/material.css
#	web/wallassets/material.js

1 files changed, 14 insertions, 0 deletions

diff --git a/scripts/update.sh b/scripts/update.sh
index d0598135..c62d104a 100644..100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -2,6 +2,20 @@
 # You can execute this file to update wallabag
 # eg: `sh update.sh prod`
 
+IGNORE_ROOT_ARG="--ignore-root-warning"
+IGNORE_ROOT=0
+
+if [ "$1" == "$IGNORE_ROOT_ARG" ]; then
+    IGNORE_ROOT=1
+fi
+
+# Abort running this script if root
+if [ "$IGNORE_ROOT" -eq 0 ] && [ "$EUID" == "0" ]; then
+    echo "Do not run this script as root!" >&2
+    echo "Use $IGNORE_ROOT_ARG to ignore this error." >&2
+    exit 1
+fi
+
 set -e
 set -u