From 54b1ee9a3da88b30364a9223420d1ba81f4e97b0 Mon Sep 17 00:00:00 2001 From: Michael Kroes Date: Sun, 1 Dec 2019 22:11:00 +0100 Subject: [PATCH] Nextcloud 17 (#1676) --- CHANGELOG.md | 2 +- setup/nextcloud.sh | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0c75963..779f13dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ WebMail: Software updates: -* Upgraded Nextcloud from 15.0.8 to 16.0.5 (with Contacts from 3.1.1 to 3.1.4 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. * Upgraded Roundcube from 1.3.10 to 1.4.1. diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh index d2a4a0ce..9ec7ff14 100755 --- a/setup/nextcloud.sh +++ b/setup/nextcloud.sh @@ -40,7 +40,7 @@ InstallNextcloud() { # their github repositories. mkdir -p /usr/local/lib/owncloud/apps - wget_verify https://github.com/nextcloud/contacts/releases/download/v3.1.4/contacts.tar.gz 297cb38c0ba9ba7ad7b8b61108033af8d7eccd96 /tmp/contacts.tgz + wget_verify https://github.com/nextcloud/contacts/releases/download/v3.1.6/contacts.tar.gz d331dc6db2ecf7c8e6166926a055dfa3b59722c3 /tmp/contacts.tgz tar xf /tmp/contacts.tgz -C /usr/local/lib/owncloud/apps/ rm /tmp/contacts.tgz @@ -91,8 +91,8 @@ InstallNextcloud() { } # Nextcloud Version to install. Checks are done down below to step through intermediate versions. -nextcloud_ver=16.0.5 -nextcloud_hash=46e8ec989de9aad9967a5a54ddb84ce8b8e2c54c +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