From 06ca2ef0a15179a65b6a1d869563b3729cf93cbb Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 26 Jun 2023 19:03:54 -0500 Subject: [PATCH] Remove shipped apps for upgrade Prevents integrity check issue Signed-off-by: Eric Nemchik --- root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 49c4045..37b0178 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 @@ -3,9 +3,7 @@ # create folders mkdir -p \ - /app/www/public/apps \ - /app/www/public/config \ - /app/www/public/themes \ + /app/www/public \ /config/www/nextcloud/apps \ /config/www/nextcloud/config \ /config/www/nextcloud/themes \ @@ -76,6 +74,10 @@ 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 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}" + done fi rsync -rlD --exclude-from=/app/upgrade.exclude /app/www/src/ /app/www/public/