From 2ee3ff074cf3b424fbe8b320ce4bd1c61584eec0 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 10 Nov 2025 19:42:16 +0000 Subject: [PATCH] ui things Signed-off-by: Andy Miller --- system/src/Grav/Console/Gpm/SelfupgradeCommand.php | 6 +++--- system/src/Grav/Installer/Install.php | 10 +++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php index e9272cb86..6f51e22c1 100644 --- a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php +++ b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php @@ -213,7 +213,7 @@ class SelfupgradeCommand extends GpmCommand Install::instance()->finalize(); $io->write(' |- Running post-install scripts... '); - $io->writeln(" '- Success! "); + $io->writeln(" |- Success! "); $io->newLine(); } } @@ -292,11 +292,11 @@ class SelfupgradeCommand extends GpmCommand $error = 0; if (!$installation) { - $io->writeln(" '- Installation failed or aborted."); + $io->writeln(" |- Installation failed or aborted."); $io->newLine(); $error = 1; } else { - $io->writeln(" '- Success! "); + $io->writeln(" |- Success! "); $manifest = Install::instance()->getLastManifest(); if (is_array($manifest) && ($manifest['id'] ?? null)) { diff --git a/system/src/Grav/Installer/Install.php b/system/src/Grav/Installer/Install.php index 44e9bf1ce..4d92dd07d 100644 --- a/system/src/Grav/Installer/Install.php +++ b/system/src/Grav/Installer/Install.php @@ -323,14 +323,10 @@ ERR; } } $progressMessage = $safeUpgradeRequested - ? 'Safe upgrade temporarily using legacy installer...' - : 'Running legacy installer...'; + ? 'Running Grav standard installer (safe mode)...' + : 'Running Grav standard installer...'; $this->relayProgress('installing', $progressMessage, null); - if ($safeUpgradeRequested) { - error_log('[Grav Upgrade] Safe upgrade requested but staging is currently disabled; running legacy installer.'); - } - Installer::install( $this->zip ?? '', GRAV_ROOT, @@ -339,7 +335,7 @@ ERR; !($this->zip && is_file($this->zip)) ); - $this->relayProgress('complete', 'Legacy installer finished.', 100); + $this->relayProgress('complete', 'Grav standard installer finished.', 100); } catch (Exception $e) { Installer::setError($e->getMessage()); }