From e92e70a00285f4f3f8b6c48331cde22a140189c2 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Wed, 28 Feb 2024 02:54:53 +0100
Subject: [PATCH] fix exec_occ config:system:set logfile

---
 scripts/upgrade | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 503e6e0..c6ea89a 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -24,13 +24,6 @@ then
     ynh_die --message="Upgrading from Nextcloud < 22.2 is not supported anymore. You should first upgrade to 22.2 using: yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/41f5f902e7c7cd3c30a6793020562ba98b9bf3e9"
 fi
 
-# move the logs from the data_dir to the standard /var/log
-if [ -f "$data_dir/data/nextcloud.log" ]; then
-    mv "$data_dir"/data/nextcloud.log* "/var/log/$app"
-    # adapt the nextcloud config
-    exec_occ config:system:set logfile --value="/var/log/$app/nextcloud.log"
-fi
-
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
@@ -245,6 +238,15 @@ then
     # Update all installed apps
     exec_occ app:update --all
 
+    # move the logs from the data_dir to the standard /var/log
+    # it would be better in the ENSURE DOWNWARD COMPATIBILITY section
+    # but it must be after the exec_occ() definition, so it's here
+    if [ -f "$data_dir/data/nextcloud.log" ]; then
+        mv "$data_dir"/data/nextcloud.log* "/var/log/$app"
+        # adapt the nextcloud config
+        exec_occ config:system:set logfile --value="/var/log/$app/nextcloud.log"
+    fi
+
     # Load the config file in nextcloud
     exec_occ config:import "$nc_conf"