Partial revert r78593 (adding --upgrade option to install.php). Rather than supportin...

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

diff --git a/maintenance/install.php b/maintenance/install.php
index 5504ed3..e782be9 100644 (file)
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -50,12 +50,8 @@ class CommandLineInstaller extends Maintenance {
                $this->addOption( 'dbpass', 'The pasword for the DB user for normal operations', false, true );
                $this->addOption( 'confpath', "Path to write LocalSettings.php to, default $IP", false, true );
                /* $this->addOption( 'dbschema', 'The schema for the MediaWiki DB in pg (mediawiki)', false, true ); */
-               /* $this->addOption( 'dbtsearch2schema', 'The schema for the tsearch2 DB in pg (public)', false, true ); */
                /* $this->addOption( 'namespace', 'The project namespace (same as the name)', false, true ); */
                $this->addOption( 'env-checks', "Run environment checks only, don't change anything" );
-               $this->addOption( 'upgrade',
-                       'Allow the upgrade to continue despite an existing LocalSettings.php', false, true );
-
        }
 
        public function execute() {
@@ -76,6 +72,13 @@ class CommandLineInstaller extends Maintenance {
                                return;
                        }
                } else {
+                       $status = $installer->doEnvironmentChecks();
+                       if( $status->isGood() ) {
+                               $installer->showMessage( 'config-env-good' );
+                       } else {
+                               $installer->showStatusMessage( $status );
+                               return;
+                       }
                        $installer->execute();
                        $installer->writeConfigurationFile( $this->getOption( 'confpath', $IP ) );
                }