mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-22 15:46:30 +00:00
Code Issues Projects Releases Wiki Activity

Allow optional --ignore-root-warning

Browse source 
Now both
./install prod --ignore-root-warning
./install --ignore-root-warning prod

will work

$1 was both used for the environment and the root flag

Fixes wallabag/wallabag#3884
This commit is contained in:
Martin Trigaux 2019-02-14 16:40:51 +05:30
parent b1992b340e
commit c01bda038e
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scripts/install.sh
View file

@ -5,9 +5,17 @@
IGNORE_ROOT_ARG="--ignore-root-warning" IGNORE_ROOT_ARG="--ignore-root-warning"
IGNORE_ROOT=0 IGNORE_ROOT=0
if [ "$1" == "$IGNORE_ROOT_ARG" ]; then while :; do
IGNORE_ROOT=1 case $1 in
fi $IGNORE_ROOT_ARG) IGNORE_ROOT=1
;;
*[a-zA-Z]) ENV=$1
;;
*) break
;;
esac
shift
done
# Abort running this script if root # Abort running this script if root
if [ "$IGNORE_ROOT" -eq 0 ] && [ "$EUID" == "0" ]; then if [ "$IGNORE_ROOT" -eq 0 ] && [ "$EUID" == "0" ]; then
@ -22,7 +30,6 @@ DIR="${BASH_SOURCE}"
if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
. "$DIR/require.sh" . "$DIR/require.sh"
ENV=$1
TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
git checkout $TAG git checkout $TAG

16
scripts/update.sh
View file

@ -5,9 +5,17 @@
IGNORE_ROOT_ARG="--ignore-root-warning" IGNORE_ROOT_ARG="--ignore-root-warning"
IGNORE_ROOT=0 IGNORE_ROOT=0
if [ "$1" == "$IGNORE_ROOT_ARG" ]; then while :; do
IGNORE_ROOT=1 case $1 in
fi $IGNORE_ROOT_ARG) IGNORE_ROOT=1
;;
*[a-zA-Z]) ENV=$1
;;
*) break
;;
esac
shift
done
# Abort running this script if root # Abort running this script if root
if [ "$IGNORE_ROOT" -eq 0 ] && [ "$EUID" == "0" ]; then if [ "$IGNORE_ROOT" -eq 0 ] && [ "$EUID" == "0" ]; then
@ -25,8 +33,6 @@ DIR="${BASH_SOURCE}"
if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
. "$DIR/require.sh" . "$DIR/require.sh"
ENV=$1
rm -rf var/cache/* rm -rf var/cache/*
git fetch origin git fetch origin
git fetch --tags git fetch --tags