From 3b0eb56b0676bc8f985407d5f3605ed475676358 Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Sat, 29 Jun 2019 10:58:52 +0200
Subject: [PATCH] Open vimdiff only if required
---
upgradeNextcloud.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/upgradeNextcloud.sh b/upgradeNextcloud.sh
index 347d60a..438da86 100644
--- a/upgradeNextcloud.sh
+++ b/upgradeNextcloud.sh
@@ -96,4 +96,7 @@ then
fi
sudo -u www-data php /var/www/nextcloud/occ app:update --all
echo "Please check difference between old and new .htaccess file"
-vimdiff $NEXTCLOUD_INSTALL_DIR{,.bak}/.htaccess
+if [ ! -z "$(diff $NEXTCLOUD_INSTALL_DIR{,.bak}/.htaccess)" ]
+then
+ vimdiff $NEXTCLOUD_INSTALL_DIR{,.bak}/.htaccess
+fi
--
GitLab