(k) fix minor glitch in installExtension.php

[lhc/web/wiklou.git] / maintenance / commandLine.inc

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index 62c7ae6..93edce1 100644 (file)
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -5,6 +5,8 @@
  * @subpackage Maintenance
  */
 
+$wgRequestTime = microtime(true);
+
 /** */
 # Abort if called from a web server
 if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
@@ -23,26 +25,35 @@ define('MEDIAWIKI',true);
 if ( !isset( $optionsWithArgs ) ) {
        $optionsWithArgs = array();
 }
+$optionsWithArgs[] = 'conf'; # For specifying the location of LocalSettings.php
 
 $self = array_shift( $argv );
-$self = __FILE__;
-$IP = realpath( dirname( $self ) . '/..' );
-chdir( $IP );
+$IP = realpath( dirname( __FILE__ ) . '/..' );
+#chdir( $IP );
+require_once( "$IP/StartProfiler.php" );
 
 $options = array();
 $args = array();
 
 
 # Parse arguments
-
 for( $arg = reset( $argv ); $arg !== false; $arg = next( $argv ) ) {
-       if ( substr( $arg, 0, 2 ) == '--' ) {
+       if ( $arg == '--' ) {
+               # End of options, remainder should be considered arguments
+               $arg = next( $argv );
+               while( $arg !== false ) {
+                       $args[] = $arg;
+                       $arg = next( $argv );
+               }
+               break;
+       } elseif ( substr( $arg, 0, 2 ) == '--' ) {
                # Long options
                $option = substr( $arg, 2 );
                if ( in_array( $option, $optionsWithArgs ) ) {
                        $param = next( $argv );
                        if ( $param === false ) {
-                               die( "$arg needs an value after it\n" );
+                               echo "$arg needs an value after it\n";
+                               die( -1 );
                        }
                        $options[$option] = $param;
                } else {
@@ -55,14 +66,15 @@ for( $arg = reset( $argv ); $arg !== false; $arg = next( $argv ) ) {
                        }
                        $options[$option] = $param;
                }
-       } elseif ( $arg{0} == '-' ) {
+       } elseif ( substr( $arg, 0, 1 ) == '-' ) {
                # Short options
                for ( $p=1; $p<strlen( $arg ); $p++ ) {
                        $option = $arg{$p};
                        if ( in_array( $option, $optionsWithArgs ) ) {
                                $param = next( $argv );
                                if ( $param === false ) {
-                                       die( "$arg needs an value after it\n" );
+                                       echo "$arg needs an value after it\n";
+                                       die( -1 );
                                }
                                $options[$option] = $param;
                        } else {
@@ -88,10 +100,11 @@ if (!isset( $wgUseNormalUser ) ) {
 
 if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
        $wgWikiFarm = true;
-       require_once( $IP.'/includes/SiteConfiguration.php' );
+       $cluster = trim( file_get_contents( '/etc/cluster' ) );
+       require_once( "$IP/includes/SiteConfiguration.php" );
 
-       # Get $conf
-       require( $IP.'/InitialiseSettings.php' );
+       # Get $wgConf
+       require( "$IP/wgConf.php" );
 
        if ( empty( $wgNoDBParam ) ) {
                # Check if we were passed a db name
@@ -127,27 +140,34 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
        $DP = $IP;
        ini_set( 'include_path', ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" );
 
+       #require_once( $IP.'/includes/ProfilerStub.php' );
        require_once( $IP.'/includes/Defines.php' );
        require_once( $IP.'/CommonSettings.php' );
 
+       $bin = '/home/wikipedia/bin';
        if ( $wgUseRootUser ) {
                $wgDBuser = $wgDBadminuser = 'root';
-               $wgDBpassword = $wgDBadminpassword = trim(`mysql_root_pass`);
+               $wgDBpassword = $wgDBadminpassword = trim(`$bin/mysql_root_pass`);
        } elseif ( !$wgUseNormalUser ) {
                $wgDBuser = $wgDBadminuser = 'wikiadmin';
-               $wgDBpassword = $wgDBadminpassword = trim(`wikiadmin_pass`);
+               $wgDBpassword = $wgDBadminpassword = trim(`$bin/wikiadmin_pass`);
        }
 } else {
        $wgWikiFarm = false;
-       $settingsFile = $IP.'/LocalSettings.php';
+       if ( isset( $options['conf'] ) ) {
+               $settingsFile = $options['conf'];
+       } else {
+               $settingsFile = "$IP/LocalSettings.php";
+       }
 
        if ( ! is_readable( $settingsFile ) ) {
                print "A copy of your installation's LocalSettings.php\n" .
                  "must exist in the source directory.\n";
-               exit();
+               exit( 1 );
        }
        $wgCommandLineMode = true;
        $DP = $IP;
+       #require_once( $IP.'/includes/ProfilerStub.php' );
        require_once( $IP.'/includes/Defines.php' );
        require_once( $settingsFile );
        ini_set( 'include_path', ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" );
@@ -162,13 +182,15 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
 # Same with these
 $wgCommandLineMode = true;
 
-if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) && $wgDBservers ) {
+if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) {
        $wgDBuser = $wgDBadminuser;
        $wgDBpassword = $wgDBadminpassword;
 
-       foreach ( $wgDBservers as $i => $server ) {
-               $wgDBservers[$i]['user'] = $wgDBuser;
-               $wgDBservers[$i]['password'] = $wgDBpassword;
+       if( $wgDBservers ) {
+               foreach ( $wgDBservers as $i => $server ) {
+                       $wgDBservers[$i]['user'] = $wgDBuser;
+                       $wgDBservers[$i]['password'] = $wgDBpassword;
+               }
        }
 }
 
@@ -181,7 +203,7 @@ ini_set( 'memory_limit', -1 );
 
 require_once( 'Setup.php' );
 require_once( 'install-utils.inc' );
-$wgTitle = Title::newFromText( 'Command line script' );
+$wgTitle = null; # Much much faster startup than creating a title object
 set_time_limit(0);
 
 // --------------------------------------------------------------------