avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-06-10 01:25:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleaner status code

Browse Source
This commit is contained in:
Alexandre
2023-03-25 11:58:21 +01:00
committed by GitHub
parent d1468a6c18
commit bab8ade1d2
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,9 +24,9 @@ for var in /data/config/log/nginx/error.log /data/config/log/nginx/access.log /d
ln -sf /proc/1/fd/1 "$var" ln -sf /proc/1/fd/1 "$var"
done done
########################### ################
# CHECK INSTALLED VERSION # # CHECK STATUS #
########################### ################
# If not installed, or files not available # If not installed, or files not available
if [[ $($LAUNCHER -V 2>&1) == *"not installed"* ]] || [ ! -f /data/config/www/nextcloud/version.php ]; then if [[ $($LAUNCHER -V 2>&1) == *"not installed"* ]] || [ ! -f /data/config/www/nextcloud/version.php ]; then
@@ -35,13 +35,27 @@ if [[ $($LAUNCHER -V 2>&1) == *"not installed"* ]] || [ ! -f /data/config/www/ne
bashio::log.green "--------------------------------------------------------------------------------------------------------------" bashio::log.green "--------------------------------------------------------------------------------------------------------------"
bashio::log.green " " bashio::log.green " "
exit 0 exit 0
else elif [[ $($LAUNCHER -V 2>&1) == *"Nextcloud"* ]]; then
# Check current version # Check current version
CURRENTVERSION="$(sed -n "s|.*\OC_VersionString = '*\(.*[^ ]\) *';.*|\1|p" /data/config/www/nextcloud/version.php)" CURRENTVERSION="$(sed -n "s|.*\OC_VersionString = '*\(.*[^ ]\) *';.*|\1|p" /data/config/www/nextcloud/version.php)"
# Log # Log
bashio::log.green "--------------------------------------" bashio::log.green "--------------------------------------"
bashio::log.green "Nextcloud $CURRENTVERSION is installed" bashio::log.green "Nextcloud $CURRENTVERSION is installed"
bashio::log.green "--------------------------------------" bashio::log.green "--------------------------------------"
# Is there an error
elif [[ $($LAUNCHER -V 2>&1) == *"Composer autoloader not found"* ]]; then
bashio::log.red "--------------------------------------------------------"
bashio::log.red "Issue in installation detected, Nextcloud will reinstall"
bashio::log.red "--------------------------------------------------------"
touch /reinstall
else
bashio::log.red "------------------------------------------------------------------"
bashio::log.red "Unknown error detected, please create issue in github or reinstall"
bashio::log.red "------------------------------------------------------------------"
bashio::log.red "Error message:"
bashio::log.red "$($LAUNCHER -V 2>&1)"
bashio::log.red "------------------------------------------------------------------"
bashio::addon.exit.nok
fi fi
######################### #########################
@@ -69,12 +83,6 @@ fi
# REINSTALL IF ISSUE # # REINSTALL IF ISSUE #
###################### ######################
# Check if issue in installation
bashio::log.green "Checking installation"
( if [[ "$(occ -V 2>&1)" == *"Composer autoloader not found"* ]]; then
touch /reinstall
fi ) &> /dev/null
# Reinstall if needed # Reinstall if needed
if [ -f /reinstall ]; then if [ -f /reinstall ]; then
rm /reinstall rm /reinstall
@@ -82,7 +90,7 @@ if [ -f /reinstall ]; then
# Redownload nextcloud if wrong version # Redownload nextcloud if wrong version
if [[ ! "$CURRENTVERSION" == "$CONTAINERVERSION" ]]; then if [[ ! "$CURRENTVERSION" == "$CONTAINERVERSION" ]]; then
basio::log.red "... version installed is : $CURRENTVERSION and version bundled is : $CONTAINERVERSION, need to redownload files" bashio::log.red "... version installed is : $CURRENTVERSION and version bundled is : $CONTAINERVERSION, need to redownload files"
bashio::log.green "... download nextcloud version" bashio::log.green "... download nextcloud version"
rm /app/nextcloud.tar.bz2 rm /app/nextcloud.tar.bz2
curl -o /app/nextcloud.tar.bz2 -L "https://download.nextcloud.com/server/releases/nextcloud-${CURRENTVERSION}.tar.bz2" --progress-bar || \ curl -o /app/nextcloud.tar.bz2 -L "https://download.nextcloud.com/server/releases/nextcloud-${CURRENTVERSION}.tar.bz2" --progress-bar || \
@@ -93,7 +101,6 @@ if [ -f /reinstall ]; then
bashio::log.green "... reinstall ongoing, please wait" bashio::log.green "... reinstall ongoing, please wait"
rm /data/config/www/nextcloud/index.php && \ rm /data/config/www/nextcloud/index.php && \
/./etc/s6-overlay/s6-rc.d/init-nextcloud-config/run /./etc/s6-overlay/s6-rc.d/init-nextcloud-config/run
fi fi
bashio::log.green "... done" bashio::log.green "... done"