diff options
author | Kevin Decherf <kevin@kdecherf.com> | 2018-10-17 11:26:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-17 11:26:12 +0200 |
commit | ae4f7dceec030439d3c05cc3ab3223764a62e0f6 (patch) | |
tree | 9d3c7b2edbd18e052df94e26b1c423011394776a | |
parent | 0658ce4f111c888f64464cfaa2a8ed392bae0a6e (diff) | |
parent | c2bd272cf35e9438374890241162b3565ef84277 (diff) | |
download | wallabag-ae4f7dceec030439d3c05cc3ab3223764a62e0f6.tar.gz wallabag-ae4f7dceec030439d3c05cc3ab3223764a62e0f6.tar.zst wallabag-ae4f7dceec030439d3c05cc3ab3223764a62e0f6.zip |
Merge pull request #3733 from Deuchnord/root-abort-update
Abort running install and update script if root
-rwxr-xr-x | scripts/install.sh | 14 | ||||
-rwxr-xr-x | scripts/update.sh | 14 |
2 files changed, 28 insertions, 0 deletions
diff --git a/scripts/install.sh b/scripts/install.sh index 62a46f4f..8b7ea03f 100755 --- a/scripts/install.sh +++ b/scripts/install.sh | |||
@@ -2,6 +2,20 @@ | |||
2 | # You can execute this file to install wallabag | 2 | # You can execute this file to install wallabag |
3 | # eg: `sh install.sh prod` | 3 | # eg: `sh install.sh prod` |
4 | 4 | ||
5 | IGNORE_ROOT_ARG="--ignore-root-warning" | ||
6 | IGNORE_ROOT=0 | ||
7 | |||
8 | if [ "$1" == "$IGNORE_ROOT_ARG" ]; then | ||
9 | IGNORE_ROOT=1 | ||
10 | fi | ||
11 | |||
12 | # Abort running this script if root | ||
13 | if [ "$IGNORE_ROOT" -eq 0 ] && [ "$EUID" == "0" ]; then | ||
14 | echo "Do not run this script as root!" >&2 | ||
15 | echo "Use $IGNORE_ROOT_ARG to ignore this error." >&2 | ||
16 | exit 1 | ||
17 | fi | ||
18 | |||
5 | COMPOSER_COMMAND='composer' | 19 | COMPOSER_COMMAND='composer' |
6 | 20 | ||
7 | DIR="${BASH_SOURCE}" | 21 | DIR="${BASH_SOURCE}" |
diff --git a/scripts/update.sh b/scripts/update.sh index d0598135..c62d104a 100755 --- a/scripts/update.sh +++ b/scripts/update.sh | |||
@@ -2,6 +2,20 @@ | |||
2 | # You can execute this file to update wallabag | 2 | # You can execute this file to update wallabag |
3 | # eg: `sh update.sh prod` | 3 | # eg: `sh update.sh prod` |
4 | 4 | ||
5 | IGNORE_ROOT_ARG="--ignore-root-warning" | ||
6 | IGNORE_ROOT=0 | ||
7 | |||
8 | if [ "$1" == "$IGNORE_ROOT_ARG" ]; then | ||
9 | IGNORE_ROOT=1 | ||
10 | fi | ||
11 | |||
12 | # Abort running this script if root | ||
13 | if [ "$IGNORE_ROOT" -eq 0 ] && [ "$EUID" == "0" ]; then | ||
14 | echo "Do not run this script as root!" >&2 | ||
15 | echo "Use $IGNORE_ROOT_ARG to ignore this error." >&2 | ||
16 | exit 1 | ||
17 | fi | ||
18 | |||
5 | set -e | 19 | set -e |
6 | set -u | 20 | set -u |
7 | 21 | ||