Merge pull request #4009 from wallabag/fix/check-git-directory

Check if .git directory exist before making the update

diff --git a/scripts/require.sh b/scripts/require.sh
index c48ab936870871a2b81fff865db76d21bd0e2405..63c38132975c99fd9211943b94ecf7b1b4947f95 100755 (executable)
--- 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 3ef1043920d3157f76b21f312037047320a91147..1f31d429c44b047cd5137de3fff26f03a73674c5 100755 (executable)
--- 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 2;
+fi
+
 rm -rf var/cache/*
 git fetch origin
 git fetch --tags