Not sure how I missed --scriptpath option since it was right above the wikiroot optio...

diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php
index 3bc45b9..af50f80 100644 (file)
--- a/includes/installer/CliInstaller.php
+++ b/includes/installer/CliInstaller.php
@@ -32,7 +32,6 @@ class CliInstaller extends CoreInstaller {
                'dbts2schema' => 'wgDBts2schema',
                'dbpath' => 'wgSQLiteDataDir',
                'scriptpath' => 'wgScriptPath',
-               'wikiroot' => 'wgScriptPath',
                'upgrade' => 'cliUpgrade', /* As long as it isn't $confItems
                                                                        * in LocalSettingsGenerator, we
                                                                        * should be fine. */

diff --git a/maintenance/install.php b/maintenance/install.php
index 8834ed3..ef0e71e 100644 (file)
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -49,7 +49,6 @@ class CommandLineInstaller extends Maintenance {
                $this->addOption( 'dbuser', 'The user to use for normal operations (wikiuser)', false, true );
                $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( 'wikiroot', "The URL to use for the wiki root (/wiki)", 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 ); */