From 51de0db3626e2889f2f93fe8838eb78551e67f48 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Thu, 14 Jun 2018 18:20:53 +0200
Subject: [PATCH] Fix Nextcloud apps upgrade (fixes #123) avoid putting
 existing apps in an inappropriate sub-directory after Nextcloud update...

---
 scripts/upgrade | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index e1901b8..6c54ca5 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -202,7 +202,8 @@ do
 
     # Backup 3rd party applications from the current nextcloud
     # But do not overwrite if there is any upgrade
-    cp -a --update "$final_path/apps" "$tmpdir/apps"
+    # (apps directory already exists in Nextcloud archive)
+    cp -a --update "$final_path/apps" "$tmpdir"
 
     # Replace the old nextcloud by the new one
     ynh_secure_remove "$final_path"