From 3510e62cb5d52f052dc3efe132e6a45e1e1b33c6 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 3 Feb 2023 11:56:58 +0100 Subject: [PATCH 1/2] feat: Add --no-upgrade option to skip calling occ upgrade after update This can be useful in scenarios running non-interactively but wanting to do both things separately Signed-off-by: Thomas Citharel --- lib/UpdateCommand.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/UpdateCommand.php b/lib/UpdateCommand.php index c3b0c381..9a438cd9 100644 --- a/lib/UpdateCommand.php +++ b/lib/UpdateCommand.php @@ -3,6 +3,8 @@ * @copyright Copyright (c) 2016 Morris Jobke * @copyright Copyright (c) 2017 Lukas Reschke * + * @author Thomas Citharel + * * @license GNU AGPL version 3 or any later version * * This program is free software: you can redistribute it and/or modify @@ -38,6 +40,8 @@ class UpdateCommand extends Command { /** @var bool */ protected $skipBackup = false; + protected bool $skipUpgrade = false; + /** @var array strings of text for stages of updater */ protected $checkTexts = [ 0 => '', @@ -60,7 +64,8 @@ protected function configure() { ->setName('update') ->setDescription('Updates the code of an Nextcloud instance') ->setHelp("This command fetches the latest code that is announced via the updater server and safely replaces the existing code with the new one.") - ->addOption('no-backup', null, InputOption::VALUE_NONE, 'Skip backup of current Nextcloud version'); + ->addOption('no-backup', null, InputOption::VALUE_NONE, 'Skip backup of current Nextcloud version') + ->addOption('no-upgrade', null, InputOption::VALUE_NONE, "Don't automatically run occ upgrade"); } public static function getUpdaterVersion(): string { @@ -74,6 +79,7 @@ public static function getUpdaterVersion(): string { protected function execute(InputInterface $input, OutputInterface $output) { $this->skipBackup = $input->getOption('no-backup'); + $this->skipUpgrade = $input->getOption('no-upgrade'); $version = static::getUpdaterVersion(); $output->writeln('Nextcloud Updater - version: ' . $version); @@ -278,6 +284,12 @@ protected function execute(InputInterface $input, OutputInterface $output) { $this->updater->log('[info] update of code successful.'); $output->writeln('Update of code successful.'); + if ($this->skipUpgrade) { + $output->writeln('Please now execute "./occ upgrade" to finish the upgrade.'); + $this->updater->log('[info] updater finished'); + return 0; + } + if ($input->isInteractive()) { $output->writeln(''); From 08a8f7b6ae49107306d1f7d07ed8445ca46e9dde Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 7 Feb 2023 14:40:23 +0100 Subject: [PATCH 2/2] Run make updater.phar again Signed-off-by: Thomas Citharel --- updater.phar | Bin 790085 -> 790513 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/updater.phar b/updater.phar index 1aae4ea24878edccfcaf1781f61c290da20143b4..027d13f82700a9fcc49118dc7dbc290bd2f35dca 100755 GIT binary patch delta 6265 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 lTId^M-BKQ83V4UyI=9Txb3