From 2f0ded40fb2c70b546553932ea42a54055817d30 Mon Sep 17 00:00:00 2001
From: Michael Kroes <michael@kroes.email>
Date: Sun, 17 Nov 2019 07:57:36 +0100
Subject: [PATCH] Upgraded Nextcloud to 17

---
 CHANGELOG.md       | 2 +-
 setup/nextcloud.sh | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0875d7f6..1cecddaa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ Under Development
 
 Software updates:
 
-* Upgraded Nextcloud from 15.0.8 to 16.0.6 (with Contacts from 3.1.1 to 3.1.6 and Calendar from 1.6.5 to 1.7.1)
+* Upgraded Nextcloud from 15.0.8 to 17.0.1 (with Contacts from 3.1.1 to 3.1.6 and Calendar from 1.6.5 to 1.7.1)
 * Upgraded Z-Push to 2.5.1.
 
 Control panel:
diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh
index 5e52d19a..65b1bb96 100755
--- a/setup/nextcloud.sh
+++ b/setup/nextcloud.sh
@@ -91,8 +91,8 @@ InstallNextcloud() {
 }
 
 # Nextcloud Version to install. Checks are done down below to step through intermediate versions.
-nextcloud_ver=16.0.6
-nextcloud_hash=0bb3098455ec89f5af77a652aad553ad40a88819
+nextcloud_ver=17.0.1
+nextcloud_hash=81e47f2288377927346a4b4cbbb2ecf1b6f4a0e1
 
 # Current Nextcloud Version, #1623
 # Checking /usr/local/lib/owncloud/version.php shows version of the Nextcloud application, not the DB
@@ -151,6 +151,10 @@ if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextc
 			InstallNextCloud 15.0.8 4129d8d4021c435f2e86876225fb7f15adf764a3
 			CURRENT_NEXTCLOUD_VER="15.0.8"
 		fi
+		if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^15 ]]; then
+                        InstallNextCloud 16.0.6 0bb3098455ec89f5af77a652aad553ad40a88819
+                        CURRENT_NEXTCLOUD_VER="16.0.6"
+                fi
 	fi
 
 	InstallNextcloud $nextcloud_ver $nextcloud_hash