ui things

Signed-off-by: Andy Miller <rhuk@mac.com>
This commit is contained in:
Andy Miller
2025-11-10 19:42:16 +00:00
parent 4fab5f99bb
commit 2ee3ff074c
2 changed files with 6 additions and 10 deletions

View File

@@ -213,7 +213,7 @@ class SelfupgradeCommand extends GpmCommand
Install::instance()->finalize();
$io->write(' |- Running post-install scripts... ');
$io->writeln(" '- <green>Success!</green> ");
$io->writeln(" |- <green>Success!</green> ");
$io->newLine();
}
}
@@ -292,11 +292,11 @@ class SelfupgradeCommand extends GpmCommand
$error = 0;
if (!$installation) {
$io->writeln(" '- <red>Installation failed or aborted.</red>");
$io->writeln(" |- <red>Installation failed or aborted.</red>");
$io->newLine();
$error = 1;
} else {
$io->writeln(" '- <green>Success!</green> ");
$io->writeln(" |- <green>Success!</green> ");
$manifest = Install::instance()->getLastManifest();
if (is_array($manifest) && ($manifest['id'] ?? null)) {

View File

@@ -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());
}