From 7a82953b3e34e07df2a6ac8b09d01b47db5da879 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 12 Jun 2019 21:33:53 +0200 Subject: [PATCH] Check if .git directory exist MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit If that folder doesn’t exist, it means the udpate script won’t be able to run because it uses git to retrieve the update. --- scripts/require.sh | 2 +- scripts/update.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/require.sh b/scripts/require.sh index c48ab936..63c38132 100755 --- a/scripts/require.sh +++ b/scripts/require.sh @@ -1,6 +1,6 @@ #! /usr/bin/env bash -# File used to check dependencies +# Check for composer if [ ! -f composer.phar ]; then echo "composer.phar not found, we'll see if composer is installed globally." command -v composer >/dev/null 2>&1 || { echo >&2 "wallabag requires composer but it's not installed (see http://doc.wallabag.org/en/master/user/installation.html). Aborting."; exit 1; } diff --git a/scripts/update.sh b/scripts/update.sh index 3ef10439..edebe5c5 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -37,6 +37,12 @@ fi . "$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 1; +fi + rm -rf var/cache/* git fetch origin git fetch --tags -- 2.41.0