'dbschema' => 'wgDBmwschema',
'dbpath' => 'wgSQLiteDataDir',
'scriptpath' => 'wgScriptPath',
- 'upgrade' => 'cliUpgrade', /* As long as it isn't $confItems
- * in LocalSettingsGenerator, we
- * should be fine. */
);
/**
* Main entry point.
*/
public function execute() {
- global $cliUpgrade;
-
$vars = $this->getExistingLocalSettings();
- if( $vars && ( !isset( $cliUpgrade ) || $cliUpgrade !== "yes" ) ) {
+ if( $vars ) {
$this->showStatusMessage(
Status::newFatal( "config-localsettings-cli-upgrade" )
);
To upgrade this installation, please enter the value of <code>\$wgUpgradeKey</code> in the box below.
You will find it in LocalSettings.php.",
'config-localsettings-cli-upgrade' => 'A LocalSettings.php file has been detected.
-To upgrade this installation, please give the --upgrade=yes option.',
+To upgrade this installation, please run update.php instead',
'config-localsettings-key' => 'Upgrade key:',
'config-localsettings-badkey' => 'The key you provided is incorrect.',
'config-upgrade-key-missing' => 'An existing installation of MediaWiki has been detected.
$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() {
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 ) );
}