Improved code

nextcloud/CHANGELOG.md

@@ -1,11 +1,18 @@
+- Improve : status check code
+- Fix : reinstallation code
 
 ## 26.0.0 (24-03-2023)
+
 - Update to latest version from linuxserver/docker-nextcloud
 - auto_update boolean option : automatically updates the nextcloud instance with the container version
+
 ### 25.0.5-14 (23-03-2023)
+
 - Minor bugs fixed
 - Revert version number to align with container
+
 ### 25.0.4-11 (22-03-2023)
+
 - Minor bugs fixed
 - Implemented safety check that reinstalls nextcloud if issue detected https://github.com/alexbelgium/hassio-addons/issues/764
 - Implemented healthcheck

nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh

@@ -28,6 +28,11 @@ done
 # CHECK STATUS #
 ################
 
+# Clean remnant files
+if [ -f /notinstalled ]; then
+    rm /notinstalled
+fi
+
 # Get launcher
 LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ"
 if [ ! -f /data/config/www/nextcloud/occ ]; then
@@ -47,6 +52,7 @@ if [[ $($LAUNCHER -V 2>&1) == *"not installed"* ]] || [ ! -f /data/config/www/ne
     bashio::log.yellow "Nextcloud not installed, please wait for addon startup, login Webui, install Nextcloud, then restart the addon"
     bashio::log.green "--------------------------------------------------------------------------------------------------------------"
     bashio::log.green " "
+    touch /notinstalled
     exit 0
 elif [[ $($LAUNCHER -V 2>&1) == *"Nextcloud"* ]]; then
     # Log

nextcloud/rootfs/etc/cont-init.d/99-add_packages.sh

@@ -1,16 +1,11 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
 
-LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ" || bashio::log.info "/data/config/www/nextcloud/occ not found"
+# Only execute if installed
-if ! bashio::fs.file_exists '/data/config/www/nextcloud/occ'; then
+if [ -f /notinstalled ]; then exit 0; fi
-    LAUNCHER=$(find / -name "occ" -print -quit)
-fi || bashio::log.info "occ not found"
 
-# Make sure there is an Nextcloud installation
+# Specify launcher
-if [[ $($LAUNCHER -V 2>&1) == *"not installed"* ]]; then
+LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ"
-    echo "... please install first Nextcloud through the webui"
-    exit 0
-fi
 
 # Install specific packages
 if [ ! -d /data/config/www/nextcloud/apps/pdfannotate ]; then

nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh

@@ -2,16 +2,11 @@
 # shellcheck shell=bash
 # shellcheck disable=SC2086
 
-LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ" || bashio::log.info "/data/config/www/nextcloud/occ not found"
+# Only execute if installed
-if ! bashio::fs.file_exists '/data/config/www/nextcloud/occ'; then
+if [ -f /notinstalled ]; then exit 0; fi
-    LAUNCHER=$(find / -name "occ" -print -quit)
-fi || bashio::log.info "occ not found"
 
-# Make sure there is an Nextcloud installation
+# Specify launcher
-if [[ $($LAUNCHER -V 2>&1) == *"not installed"* ]]; then
+LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ"
-    echo "... please install first Nextcloud through the webui"
-    exit 0
-fi
 
 if $LAUNCHER fulltextsearch:test &>/dev/null; then
     echo "Full Text Search is already working"

nextcloud/rootfs/etc/cont-init.d/99-ocr.sh

@@ -1,16 +1,11 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
 
-LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ" || bashio::log.info "/data/config/www/nextcloud/occ not found"
+# Only execute if installed
-if ! bashio::fs.file_exists '/data/config/www/nextcloud/occ'; then
+if [ -f /notinstalled ]; then exit 0; fi
-    LAUNCHER=$(find / -name "occ" -print -quit)
-fi || bashio::log.info "occ not found"
 
-# Make sure there is an Nextcloud installation
+# Specify launcher
-if [[ $($LAUNCHER -V 2>&1) == *"not installed"* ]]; then
+LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ"
-    echo "... please install first Nextcloud through the webui"
-    exit 0
-fi
 
 # Install OCR if requested
 if [ "$(bashio::config 'OCR')" = "true" ]; then

nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh

@@ -1,16 +1,11 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
 
-LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ" || bashio::log.info "/data/config/www/nextcloud/occ not found"
+# Only execute if installed
-if ! bashio::fs.file_exists '/data/config/www/nextcloud/occ'; then
+if [ -f /notinstalled ]; then exit 0; fi
-    LAUNCHER=$(find / -name "occ" -print -quit)
-fi || bashio::log.info "occ not found"
 
-# Make sure there is an Nextcloud installation
+# Specify launcher
-if [[ $($LAUNCHER -V 2>&1) == *"not installed"* ]]; then
+LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ"
-    echo "... please install first Nextcloud through the webui"
-    exit 0
-fi
 
 ####################
 # Initialization   #