X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fupdate.sh;h=1f31d429c44b047cd5137de3fff26f03a73674c5;hb=48b0163d247554d7e2f1ec63b717c8216ea9ec59;hp=f43c4f24c999ca0c6a72ca430a62ed66c2194466;hpb=99692e8c3322f31fa19b010ce488f88c5f3ce43a;p=github%2Fwallabag%2Fwallabag.git

diff --git a/scripts/update.sh b/scripts/update.sh
old mode 100644
new mode 100755
index f43c4f24..1f31d429
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -2,18 +2,52 @@
 # You can execute this file to update wallabag
 # eg: `sh update.sh prod`
 
+IGNORE_ROOT_ARG="--ignore-root-warning"
+IGNORE_ROOT=0
+
+while :; do
+    case $1 in
+        $IGNORE_ROOT_ARG) IGNORE_ROOT=1
+        ;;
+        *[a-zA-Z]) ENV=$1
+        ;;
+        *) break
+        ;;
+    esac
+    shift
+done
+
+# 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
+
 COMPOSER_COMMAND='composer'
+REQUIRE_FILE='scripts/require.sh'
 
-DIR="${BASH_SOURCE}"
-if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
-. "$DIR/require.sh"
+if [ ! -f "$REQUIRE_FILE" ]; then
+  echo "Cannot find $REQUIRE_FILE"
+  exit 1
+fi
 
-ENV=$1
-TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
+. "$REQUIRE_FILE"
+
+# Check for wallabag .git folder
+if [ ! -d .git ]; then
+    echo "Can not update because wallabag wasn't installed using git (see https://doc.wallabag.org/en/admin/upgrade.html#upgrade-on-a-shared-hosting). Aborting.";
+    exit 2;
+fi
 
 rm -rf var/cache/*
 git fetch origin
 git fetch --tags
+TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
 git checkout $TAG --force
 SYMFONY_ENV=$ENV $COMPOSER_COMMAND install --no-dev -o --prefer-dist
+php bin/console doctrine:migrations:migrate --no-interaction --env=$ENV
 php bin/console cache:clear --env=$ENV