eta shows revs/pages per sec in current interval as well as overall; useful for inves...

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

diff --git a/maintenance/eval.php b/maintenance/eval.php
index 1545c30..9229ae2 100644 (file)
--- a/maintenance/eval.php
+++ b/maintenance/eval.php
@@ -12,10 +12,26 @@
  * To get decent line editing behavior, you should compile PHP with support
  * for GNU readline (pass --with-readline to configure).
  *
- * @addtogroup Maintenance
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Maintenance
  */
 
-$wgUseNormalUser = (bool)getenv('MW_WIKIUSER');
+$wgUseNormalUser = (bool)getenv( 'MW_WIKIUSER' );
 
 $optionsWithArgs = array( 'd' );
 
@@ -38,19 +54,33 @@ if ( isset( $options['d'] ) ) {
        }
 }
 
+if ( function_exists( 'readline_add_history' )
+       && posix_isatty( 0 /*STDIN*/ ) )
+{
+       $useReadline = true;
+} else {
+       $useReadline = false;
+}
+
+if ( $useReadline ) {
+       $historyFile = isset( $_ENV['HOME'] ) ?
+               "{$_ENV['HOME']}/.mweval_history" : "$IP/maintenance/.mweval_history";
+       readline_read_history( $historyFile );
+}
 
-while ( ( $line = readconsole( '> ' ) ) !== false ) {
+while ( ( $line = Maintenance::readconsole() ) !== false ) {
+       if ( $useReadline ) {
+               readline_add_history( $line );
+               readline_write_history( $historyFile );
+       }
        $val = eval( $line . ";" );
-       if( is_null( $val ) ) {
+       if ( is_null( $val ) ) {
                echo "\n";
-       } elseif( is_string( $val ) || is_numeric( $val ) ) {
+       } elseif ( is_string( $val ) || is_numeric( $val ) ) {
                echo "$val\n";
        } else {
                var_dump( $val );
        }
-       if ( function_exists( "readline_add_history" ) ) {
-               readline_add_history( $line );
-       }
 }
 
 print "\n";