Add a way for packagers to override some installation details

[lhc/web/wiklou.git] / maintenance / install.php

diff --git a/maintenance/install.php b/maintenance/install.php
index 781b12d..65d6a70 100644 (file)
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -20,8 +20,8 @@
  * @see wfWaitForSlaves()
  */
 
-if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.2.3' ) < 0 ) ) {
-       echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP 5.2.3 or higher. ABORTING.\n" .
+if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.3.2' ) < 0 ) ) {
+       echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP 5.3.2 or higher. ABORTING.\n" .
        "Check if you have a newer php executable with a different name, such as php5.\n";
        die( 1 );
 }
@@ -40,7 +40,7 @@ class CommandLineInstaller extends Maintenance {
 
                $this->addArg( 'admin', 'The username of the wiki administrator (WikiSysop)', true );
                $this->addOption( 'pass', 'The password for the wiki administrator. You will be prompted for this if it isn\'t provided', false, true );
-               $this->addOption( 'email', 'The email for the wiki administrator', false, true );
+               /* $this->addOption( 'email', 'The email for the wiki administrator', false, true ); */
                $this->addOption( 'scriptpath', 'The relative path of the wiki in the web server (/wiki)', false, true );
 
                $this->addOption( 'lang', 'The language to use (en)', false, true );
@@ -51,6 +51,7 @@ class CommandLineInstaller extends Maintenance {
                $this->addOption( 'dbport', 'The database port; only for PostgreSQL (5432)', false, true );
                $this->addOption( 'dbname', 'The database name (my_wiki)', false, true );
                $this->addOption( 'dbpath', 'The path for the SQLite DB (/var/data)', false, true );
+               $this->addOption( 'dbprefix', 'Optional database table name prefix', false, true );
                $this->addOption( 'installdbuser', 'The user to use for installing (root)', false, true );
                $this->addOption( 'installdbpass', 'The pasword for the DB user to install as.', false, true );
                $this->addOption( 'dbuser', 'The user to use for normal operations (wikiuser)', false, true );
@@ -76,11 +77,11 @@ class CommandLineInstaller extends Maintenance {
                        if ( $dbpass === false ) {
                                $this->error( "Couldn't open $dbpassfile", true );
                        }
-                       $this->mOptions['dbpass'] = $dbpass;
+                       $this->mOptions['dbpass'] = trim( $dbpass, "\r\n" );
                }
 
                $installer =
-                       new CliInstaller( $siteName, $adminName, $this->mOptions );
+                       InstallerOverrides::getCliInstaller( $siteName, $adminName, $this->mOptions );
 
                $status = $installer->doEnvironmentChecks();
                if( $status->isGood() ) {