From 83130cfca397d9c5f72e0f74810cdafc1e65a772 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Mon, 19 Jun 2023 14:20:05 +0200
Subject: [PATCH] Force upgrades

---
 .../rootfs/etc/cont-init.d/98-upgrade.sh      | 42 +++++++++----------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh b/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh
index 814d02418..46369289b 100755
--- a/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh
+++ b/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh
@@ -18,30 +18,26 @@ CONTAINERVERSION="$(cat /nextcloudversion)"
 function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; }
 
 # Updater code
-if ! bashio::config.true "disable_updates"; then
-    bashio::log.green "Auto_updater set, checking for updates"
-    # Install new version
+bashio::log.green "Checking for nextcloud updates"
+# Install new version
+sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/updater/updater.phar --no-interaction"
+sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade"
+# Install additional versions
+while [[ $(occ update:check 2>&1) == *"update available"* ]]; do
+    bashio::log.yellow "-----------------------------------------------------------------------"
+    bashio::log.yellow "  new version available, updating. Please do not turn off your addon!  "
+    bashio::log.yellow "-----------------------------------------------------------------------"
     sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/updater/updater.phar --no-interaction"
     sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade"
+done
+    
+if ! bashio::config.true "disable_updates"; then
+    bashio::log.green "---"
+    bashio::log.green "Updating apps"
     sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ app:update --all"
-    # Install additional versions
-    while [[ $(occ update:check 2>&1) == *"update available"* ]]; do
-        bashio::log.yellow "-----------------------------------------------------------------------"
-        bashio::log.yellow "  new version available, updating. Please do not turn off your addon!  "
-        bashio::log.yellow "-----------------------------------------------------------------------"
-        sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/updater/updater.phar --no-interaction"
-        sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade"
-    done
-    # Reset permissions
-    /./etc/cont-init.d/01-folders.sh
-elif bashio::config.true "disable_updates" && [ "$(version "$CONTAINERVERSION")" -gt "$(version "$CURRENTVERSION")" ]; then
-    bashio::log.warning " "
-    bashio::log.warning "----------------------------------------- "
-    bashio::log.warning "New version available : $CONTAINERVERSION"
-    bashio::log.warning "-----------------------------------------"
-    bashio::log.warning " "
-    bashio::log.warning "...auto_updater not set in addon options, please update from nextcloud settings"
-    bashio::log.warning "If you don't update you risk an addon breakage !"
-    bashio::log.warning " "
-    bashio::log.warning "-----------------------------------------"
+else
+    bashio::log.green "disable_updates set, please update the apps manually"
 fi
+
+# Reset permissions
+/./etc/cont-init.d/01-folders.sh