From 681e04b0605d2e526f6adc2f99c2ff8fc9e842a7 Mon Sep 17 00:00:00 2001 From: Olivier Mehani Date: Sat, 18 Aug 2018 15:39:37 +1000 Subject: Makefile fixes for non GNU systems * Move `Makefile` to `GNUmakefile`, which GNU `make` picks first * Add `Makefile` so other `make`s forward to `gmake` * Set the `SHELL` variable and let `make` handle the shell Signed-off-by: Olivier Mehani --- scripts/dev.sh | 0 scripts/install.sh | 0 scripts/release.sh | 0 scripts/require.sh | 0 scripts/update.sh | 0 5 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/dev.sh mode change 100644 => 100755 scripts/install.sh mode change 100644 => 100755 scripts/release.sh mode change 100644 => 100755 scripts/require.sh mode change 100644 => 100755 scripts/update.sh (limited to 'scripts') diff --git a/scripts/dev.sh b/scripts/dev.sh old mode 100644 new mode 100755 diff --git a/scripts/install.sh b/scripts/install.sh old mode 100644 new mode 100755 diff --git a/scripts/release.sh b/scripts/release.sh old mode 100644 new mode 100755 diff --git a/scripts/require.sh b/scripts/require.sh old mode 100644 new mode 100755 diff --git a/scripts/update.sh b/scripts/update.sh old mode 100644 new mode 100755 -- cgit v1.2.3 From 23aa47d8286219f01329fa46359214c8e2fbc4d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Deuchnord?= Date: Sat, 6 Oct 2018 12:23:40 +0200 Subject: Abort running install and update script if root (closes #3590) --- scripts/install.sh | 6 ++++++ scripts/update.sh | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'scripts') diff --git a/scripts/install.sh b/scripts/install.sh index 62a46f4f..7d3311b0 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -2,6 +2,12 @@ # You can execute this file to install wallabag # eg: `sh install.sh prod` +# Abort running this script if root +if [ "$EUID" == "0" ]; then + echo "Do not run this script as root!" >&2 + exit 1 +fi + COMPOSER_COMMAND='composer' DIR="${BASH_SOURCE}" diff --git a/scripts/update.sh b/scripts/update.sh index d0598135..4911d7c4 100644 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -2,6 +2,12 @@ # You can execute this file to update wallabag # eg: `sh update.sh prod` +# Abort running this script if root +if [ "$EUID" == "0" ]; then + echo "Do not run this script as root!" >&2 + exit 1 +fi + set -e set -u -- cgit v1.2.3 From c2bd272cf35e9438374890241162b3565ef84277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Deuchnord?= Date: Tue, 16 Oct 2018 20:32:25 +0200 Subject: Added argument to ignore the warning. --- scripts/install.sh | 10 +++++++++- scripts/update.sh | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/install.sh b/scripts/install.sh index 7d3311b0..8b7ea03f 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -2,9 +2,17 @@ # 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 [ "$EUID" == "0" ]; then +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 diff --git a/scripts/update.sh b/scripts/update.sh index 4911d7c4..c62d104a 100644 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -2,9 +2,17 @@ # 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 [ "$EUID" == "0" ]; then +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 -- cgit v1.2.3