X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Finstall.php;h=bf39fbd5177ecca7e11e31728da8fa25f408facd;hb=18c2d20c54f9851af639cb24603493ca197baaa8;hp=a71bb74a5ccdb5368ff7e5ab7e90f92a3bc52eb2;hpb=5e2788a0c5c9e22da8b22993ae97c27cc836a839;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/install.php b/maintenance/install.php index a71bb74a5c..bf39fbd517 100644 --- a/maintenance/install.php +++ b/maintenance/install.php @@ -60,6 +60,12 @@ class CommandLineInstaller extends Maintenance { false, true ); + $this->addOption( + 'server', + 'The base URL of the web server the wiki will be on (http://localhost)', + false, + true + ); $this->addOption( 'lang', 'The language to use (en)', false, true ); /* $this->addOption( 'cont-lang', 'The content language (en)', false, true ); */ @@ -118,7 +124,7 @@ class CommandLineInstaller extends Maintenance { try { $installer = InstallerOverrides::getCliInstaller( $siteName, $adminName, $this->mOptions ); } catch ( \MediaWiki\Installer\InstallException $e ) { - $this->output( $e->getStatus()->getMessage()->parse() . "\n" ); + $this->output( $e->getStatus()->getMessage( false, false, 'en' )->text() . "\n" ); return false; } @@ -133,6 +139,8 @@ class CommandLineInstaller extends Maintenance { if ( !$envChecksOnly ) { $status = $installer->execute(); if ( !$status->isGood() ) { + $installer->showStatusMessage( $status ); + return false; } $installer->writeConfigurationFile( $this->getOption( 'confpath', $IP ) );