Merge pull request #3733 from Deuchnord/root-abort-update

Abort running install and update script if root

diff --git a/scripts/install.sh b/scripts/install.sh
index 62a46f4fb60f8100b6228cfcc0a28d6f0ff3ec23..8b7ea03f5fe77030abafbde6d852e5d425da0384 100755 (executable)
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -2,6 +2,20 @@
 # You can execute this file to install wallabag
 # eg: `sh install.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
+
 COMPOSER_COMMAND='composer'
 
 DIR="${BASH_SOURCE}"

diff --git a/scripts/update.sh b/scripts/update.sh
index d0598135c459da808123851f231e46bdfcafa325..c62d104a3353a2e1443cc31a33d4d3270f74e2cc 100755 (executable)
--- 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