From d151fd013f86933409d88dbdd26222232842031f Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 27 Jun 2023 18:19:21 -0500 Subject: [PATCH] Remove disabled apps logic (was broken) Signed-off-by: Eric Nemchik --- root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run | 6 ------ 1 file changed, 6 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run b/root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run index 9911ed3..9e47ceb 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run @@ -73,7 +73,6 @@ if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_instal echo "Initializing nextcloud ${image_version} (this can take a while) ..." if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_upgrade ]; then echo "Upgrading nextcloud from ${installed_version} ..." - occ app:list | sed -n "/Enabled:/,/Disabled:/p" >/tmp/list_before shippedApps=$(jq -r .shippedApps[] /app/www/src/core/shipped.json) for app in ${shippedApps}; do rm -rf "/config/www/nextcloud/apps/${app}" @@ -99,10 +98,6 @@ if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_instal if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_upgrade ]; then # Upgrade occ upgrade - - occ app:list | sed -n "/Enabled:/,/Disabled:/p" >/tmp/list_after - echo "The following apps have been disabled:" - diff /tmp/list_before /tmp/list_after | grep '<' | cut -d- -f2 | cut -d: -f1 else if [ "${installed_version}" = "0.0.0.0" ]; then # Install @@ -111,7 +106,6 @@ if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_instal fi fi - rm -f /tmp/list_before /tmp/list_after echo "Initializing finished" fi