From 72d2d00f747e3297f8d0525550a9d5290f41414d Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Sat, 30 Nov 2019 08:42:40 -0700
Subject: upgrade to NC17.0.1

Signed-off-by: nachoparker <nacho@ownyourbits.com>
---
 README.md                         |   2 +-
 bin/ncp/CONFIG/nc-init.sh         |   8 +++++---
 changelog.md                      |   4 +++-
 etc/logo                          | Bin 77792 -> 18694 bytes
 etc/ncp-config.d/nc-nextcloud.cfg |   2 +-
 etc/ncp.cfg                       |   2 +-
 updates/1.19.0.sh                 |  10 ++++++++++
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 435326bc..58a267e3 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Find the full documentation at [docs.nextcloudpi.com](http://docs.nextcloudpi.co
 ## Features
 
  * Debian/Raspbian 10 Buster
- * Nextcloud 16.0.5
+ * Nextcloud 17.0.1
  * Apache 2.4.25, with HTTP2 enabled
  * PHP 7.3
  * MariaDB 10
diff --git a/bin/ncp/CONFIG/nc-init.sh b/bin/ncp/CONFIG/nc-init.sh
index b81c39e2..f1bddc49 100644
--- a/bin/ncp/CONFIG/nc-init.sh
+++ b/bin/ncp/CONFIG/nc-init.sh
@@ -26,11 +26,11 @@ configure()
 
   # launch mariadb if not already running
   if ! pgrep -c mysqld &>/dev/null; then
-    mysqld & 
+    mysqld &
   fi
 
   # wait for mariadb
-  pgrep -x mysqld &>/dev/null || { 
+  pgrep -x mysqld &>/dev/null || {
     echo "mariaDB process not found. Waiting..."
     while :; do
       [[ -S /run/mysqld/mysqld.sock ]] && break
@@ -125,7 +125,9 @@ EOF
     local ID=$( grep instanceid config/config.php | awk -F "=> " '{ print $2 }' | sed "s|[,']||g" )
     [[ "$ID" == "" ]] && { echo "failed to get ID"; return 1; }
     mkdir -p data/appdata_${ID}/theming/images
-    cp /usr/local/etc/logo /usr/local/etc/background data/appdata_${ID}/theming/images
+    cp /usr/local/etc/background data/appdata_${ID}/theming/images
+    cp /usr/local/etc/logo data/appdata_${ID}/theming/images/logo
+    cp /usr/local/etc/logo data/appdata_${ID}/theming/images/logoheader
     chown -R www-data:www-data data/appdata_${ID}
   }
 
diff --git a/changelog.md b/changelog.md
index 42aff436..cb32da94 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,7 @@
 
-[v1.18.2](https://github.com/nextcloud/nextcloudpi/commit/b737569) (2019-11-18) ncp-app: bump to NC17
+[v1.19.0](https://github.com/nextcloud/nextcloudpi/commit/c8e296c) (2019-11-30) upgrade to NC17.0.1
+
+[v1.18.2 ](https://github.com/nextcloud/nextcloudpi/commit/0fc4aea) (2019-11-18) ncp-app: bump to NC17
 
 [v1.18.1 ](https://github.com/nextcloud/nextcloudpi/commit/e975320) (2019-11-18) Letsencrypt: support second domain (#1025)
 
diff --git a/etc/logo b/etc/logo
index 79131687..859af800 100644
Binary files a/etc/logo and b/etc/logo differ
diff --git a/etc/ncp-config.d/nc-nextcloud.cfg b/etc/ncp-config.d/nc-nextcloud.cfg
index 90548740..42f99abc 100644
--- a/etc/ncp-config.d/nc-nextcloud.cfg
+++ b/etc/ncp-config.d/nc-nextcloud.cfg
@@ -9,7 +9,7 @@
     {
       "id": "VER",
       "name": "Version",
-      "value": "16.0.5"
+      "value": "17.0.1"
     },
     {
       "id": "BETA",
diff --git a/etc/ncp.cfg b/etc/ncp.cfg
index ce5e6692..1f458fc5 100644
--- a/etc/ncp.cfg
+++ b/etc/ncp.cfg
@@ -1,5 +1,5 @@
 {
-	"nextcloud_version": "16.0.5",
+	"nextcloud_version": "17.0.1",
 	"php_version": "7.3",
 	"release": "buster"
 }
diff --git a/updates/1.19.0.sh b/updates/1.19.0.sh
index e7b88a39..731c147c 100644
--- a/updates/1.19.0.sh
+++ b/updates/1.19.0.sh
@@ -18,6 +18,16 @@ source /usr/local/etc/library.sh # sets NCVER PHPVER RELEASE
   }
 }
 
+# if using NCP original logo, replace with the new version
+datadir=$(ncc config:system:get datadirectory)
+id=$(grep instanceid /var/www/nextcloud/config/config.php | awk -F "=> " '{ print $2 }' | sed "s|[,']||g")
+sum_orig=ca39ff587bd899cb92eb0f5a6d429824
+sum_curr=$(md5sum "${datadir}"/appdata_*/theming/images/logo | awk '{ print $1 }')
+[[ "${sum_orig}" == "${sum_curr}" ]] && {
+  cp etc/logo "${datadir}/appdata_${id}/theming/images/logo"
+  cp etc/logo "${datadir}/appdata_${id}/theming/images/logoheader"
+}
+
 # docker images only
 [[ -f /.docker-image ]] && {
   :
-- 
cgit v1.2.3