From 7afdc0fe8dffd71785782c8c6ac4edf8f3ada42a Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Tue, 24 Nov 2020 20:03:10 -0700
Subject: upgrade to NC20.0.2

Signed-off-by: nachoparker <nacho@ownyourbits.com>
---
 README.md                             |  2 +-
 bin/ncp-update-nc                     | 15 +++++----------
 changelog.md                          |  6 ++++--
 etc/ncp-config.d/nc-nextcloud.cfg     |  2 +-
 etc/ncp.cfg                           |  2 +-
 ncp-app/appinfo/info.xml              |  2 +-
 ncp-previewgenerator/appinfo/info.xml |  2 +-
 7 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 619d3ae0..9ef96336 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 19.0.4
+ * Nextcloud 20.0.2
  * Apache 2.4.25, with HTTP2 enabled
  * PHP 7.3
  * MariaDB 10
diff --git a/bin/ncp-update-nc b/bin/ncp-update-nc
index 013e9187..25ed025d 100755
--- a/bin/ncp-update-nc
+++ b/bin/ncp-update-nc
@@ -132,16 +132,10 @@ cp nextcloud-old/config/config.php nextcloud/config/
 ####################
 cp -raT nextcloud-old/themes/ nextcloud/themes/
 
-# copy apps
-####################
-echo "Restore apps..."
-for app in $( ls nextcloud-old/apps/*/ -d ); do
-  app=$( basename "$app" )
-  [[ ! -d nextcloud/apps/$app ]] && {
-    echo " * $app"
-    cp -r nextcloud-old/apps/$app nextcloud/apps
-  }
-done
+# copy old NCP apps
+####################
+cp -r nextcloud-old/apps/{nextcloudpi,previewgenerator} /var/www/nextcloud/apps/
+
 #false # test point
 
 # copy data if it was at the default location
@@ -183,6 +177,7 @@ ncc='sudo -u www-data php nextcloud/occ'
 $ncc upgrade      # && false # test point
 $ncc db:add-missing-indices
 $ncc | grep -q db:add-missing-columns && $ncc db:add-missing-columns
+$ncc | grep -q db:add-missing-primary-keys && $ncc db:add-missing-primary-keys
 
 # done
 ####################
diff --git a/changelog.md b/changelog.md
index 85988f7f..08e9c85a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,7 +1,9 @@
 
-[v1.31.0](https://github.com/nextcloud/nextcloudpi/commit/edcfde3) (2020-10-19) upgrade to NC19.0.4
+[v1.32.0](https://github.com/nextcloud/nextcloudpi/commit/3d6f3d4) (2020-11-24) upgrade to NC20.0.2
 
-[v1.30.1](https://github.com/nextcloud/nextcloudpi/commit/9450613) (2020-10-20) nc-info: fixed api change for portchecker (#1194)
+[v1.31.0](https://github.com/nextcloud/nextcloudpi/commit/ab9184c) (2020-10-19) upgrade to NC19.0.4
+
+[v1.30.1 ](https://github.com/nextcloud/nextcloudpi/commit/9450613) (2020-10-20) nc-info: fixed api change for portchecker (#1194)
 
 [v1.30.0 ](https://github.com/nextcloud/nextcloudpi/commit/f00fe21) (2020-09-19) upgrade to NC19.0.2
 
diff --git a/etc/ncp-config.d/nc-nextcloud.cfg b/etc/ncp-config.d/nc-nextcloud.cfg
index c96338bd..af19405c 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": "19.0.4"
+      "value": "20.0.2"
     },
     {
       "id": "BETA",
diff --git a/etc/ncp.cfg b/etc/ncp.cfg
index b87b7667..dbc08425 100644
--- a/etc/ncp.cfg
+++ b/etc/ncp.cfg
@@ -1,5 +1,5 @@
 {
-	"nextcloud_version": "19.0.4",
+	"nextcloud_version": "20.0.2",
 	"php_version": "7.3",
 	"release": "buster"
 }
diff --git a/ncp-app/appinfo/info.xml b/ncp-app/appinfo/info.xml
index 05a4e2e4..67a837e4 100644
--- a/ncp-app/appinfo/info.xml
+++ b/ncp-app/appinfo/info.xml
@@ -12,7 +12,7 @@
     <category>tools</category>
     <bugs>https://github.com/nextcloud/nextcloudpi/issues</bugs>
     <dependencies>
-        <nextcloud min-version="14" max-version="19"/>
+        <nextcloud min-version="14" max-version="20"/>
     </dependencies>
     <navigations>
         <navigation>
diff --git a/ncp-previewgenerator/appinfo/info.xml b/ncp-previewgenerator/appinfo/info.xml
index c499dc31..f28e35f2 100644
--- a/ncp-previewgenerator/appinfo/info.xml
+++ b/ncp-previewgenerator/appinfo/info.xml
@@ -24,7 +24,7 @@ The first time you activate this app through 'nc-previews-auto', you properly wa
 	</types>
 	<dependencies>
 		<php min-version="7.0"/>
-		<nextcloud min-version="14" max-version="19" />
+		<nextcloud min-version="14" max-version="20" />
 	</dependencies>
 
 	<commands>
-- 
cgit v1.2.3