From da8f0a00f62456d459feb5aca68d1846c723a9e4 Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre.pary@gmail.com>
Date: Fri, 31 Mar 2023 21:44:03 +0200
Subject: [PATCH] Update

---
 nextcloud/Dockerfile                           | 10 ++--------
 nextcloud/config.json                          |  2 +-
 nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh | 10 ++++------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index 5db97cafa..20b09dd37 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -132,14 +132,8 @@ RUN \
     cat /defaults/nginx_addition >> /defaults/nginx/site-confs/default.conf.sample && \
     \
     # Rename smb files
-    mv 92-local_mounts.sh 00-local_mounts.sh && \
-    mv 92-smb_mounts.sh 00-smb_mounts.sh 
-
-#RUN chmod 777 /entrypoint.sh
-#WORKDIR /
-#ENTRYPOINT [ "/usr/bin/env" ]
-#CMD [ "/entrypoint.sh" ]
-#SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+    mv /etc/cont-init.d/92-local_mounts.sh /etc/cont-init.d/00-local_mounts.sh && \
+    mv /etc/cont-init.d/92-smb_mounts.sh /etc/cont-init.d/00-smb_mounts.sh
 
 ############
 # 5 Labels #
diff --git a/nextcloud/config.json b/nextcloud/config.json
index 638a6eeb5..6f2047912 100644
--- a/nextcloud/config.json
+++ b/nextcloud/config.json
@@ -106,6 +106,6 @@
   "slug": "nextcloud_ocr",
   "uart": true,
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud",
-  "version": "26.0.0-4",
+  "version": "26.0.0-5_updater",
   "webui": "https://[HOST]:[PORT:443]"
 }
\ No newline at end of file
diff --git a/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh b/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh
index e4b42e178..ab964fbfd 100644
--- a/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh
+++ b/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh
@@ -20,8 +20,10 @@ 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
     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!  "
@@ -29,14 +31,10 @@ if ! bashio::config.true "disable_updates"; then
         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
+    /./01-folders.sh
 elif bashio::config.true "disable_updates" && [ "$(version "$CONTAINERVERSION")" -gt "$(version "$CURRENTVERSION")" ]; then
     bashio::log.yellow " "
     bashio::log.yellow "New version available : $CONTAINERVERSION"
     bashio::log.yellow "...auto_updater not set in addon options, please update from nextcloud settings"
 fi
-
-#####################
-# RESET PERMISSIONS #
-#####################
-
-/./01-folders.sh