X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Finstall.php;h=bf39fbd5177ecca7e11e31728da8fa25f408facd;hb=18c2d20c54f9851af639cb24603493ca197baaa8;hp=1dd19094976773245fb112f41b25a38c6ae6d2ec;hpb=962b690e92a258bd53100e976dc5575180696bf0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/install.php b/maintenance/install.php
index 1dd1909497..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 ); */
@@ -115,7 +121,12 @@ class CommandLineInstaller extends Maintenance {
 			$this->setPassOption();
 		}
 
-		$installer = InstallerOverrides::getCliInstaller( $siteName, $adminName, $this->mOptions );
+		try {
+			$installer = InstallerOverrides::getCliInstaller( $siteName, $adminName, $this->mOptions );
+		} catch ( \MediaWiki\Installer\InstallException $e ) {
+			$this->output( $e->getStatus()->getMessage( false, false, 'en' )->text() . "\n" );
+			return false;
+		}
 
 		$status = $installer->doEnvironmentChecks();
 		if ( $status->isGood() ) {
@@ -123,17 +134,23 @@ class CommandLineInstaller extends Maintenance {
 		} else {
 			$installer->showStatusMessage( $status );
 
-			return;
+			return false;
 		}
 		if ( !$envChecksOnly ) {
-			$installer->execute();
+			$status = $installer->execute();
+			if ( !$status->isGood() ) {
+				$installer->showStatusMessage( $status );
+
+				return false;
+			}
 			$installer->writeConfigurationFile( $this->getOption( 'confpath', $IP ) );
+			$installer->showMessage(
+				'config-install-success',
+				$installer->getVar( 'wgServer' ),
+				$installer->getVar( 'wgScriptPath' )
+			);
 		}
-		$installer->showMessage(
-			'config-install-success',
-			$installer->getVar( 'wgServer' ),
-			$installer->getVar( 'wgScriptPath' )
-		);
+		return true;
 	}
 
 	private function setDbPassOption() {