From eeae1b92432b40920a5fff75be0494c533481ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Martin?= Date: Thu, 21 Feb 2019 18:24:14 +0100 Subject: [PATCH] Revert "Limit upgrade operations (patches, maintenance, etc.) to the last upgrade" This reverts commit a9bb825abb4075103094af3f0ea0013d8fc9ee4d. --- scripts/upgrade | 2 -- scripts/upgrade.d/upgrade.last.sh | 11 ++++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index d58f4b0..44327db 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -176,8 +176,6 @@ do # then it's the last upgrade to do if [ "$major_version" -eq "$current_major_version" ]; then current_major_version=last - # Execute the commands dedicated to the last upgrade - last_upgrade_operations fi # Load the value for this version diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index e061d31..2bed20b 100755 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -6,11 +6,8 @@ next_version="15.0.0" # Nextcloud tarball checksum sha256 nextcloud_source_sha256="5bb0c58171353da844019b64080c21078002a59ab956ab72adb958844a98eb78" -# This function will only be executed upon applying the last upgrade referenced above -last_upgrade_operations () { - # Patch nextcloud files only for the last version - cp -a ../sources/patches_last_version/* ../sources/patches +# Patch nextcloud files only for the last version +cp -a ../sources/patches_last_version/* ../sources/patches - # Execute post-upgrade operations later on - (cd /tmp ; at now + 10 minutes <<< "(cd $final_path ; sudo -u nextcloud php occ db:add-missing-indices ; sudo -u nextcloud php occ db:convert-filecache-bigint -n) > /tmp/nextcloud_maintenance.log") -} +# Execute post-upgrade operations later on +(cd /tmp ; at now + 10 minutes <<< "(cd $final_path ; sudo -u nextcloud php occ db:add-missing-indices ; sudo -u nextcloud php occ db:convert-filecache-bigint -n) > /tmp/nextcloud_maintenance.log")