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>
---
 bin/ncp-update-nc | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'bin')

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
 ####################
-- 
cgit v1.2.3