| Index: trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki.php |
| — | — | @@ -1,6 +1,6 @@ |
| 2 | 2 | <?php |
| 3 | 3 | if ( php_sapi_name() !== 'cli' ) { |
| 4 | | - die( 'This script can only be run from the command line.' ); |
| | 4 | + die( "This script can only be run from the command line.\n" ); |
| 5 | 5 | } |
| 6 | 6 | |
| 7 | 7 | error_reporting( E_ALL ); |
| — | — | @@ -36,7 +36,7 @@ |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | if ( !$argsValid ) { |
| 40 | | - die( "Usage: checkoutMediaWiki.php X.XXwmfX php-X.XX" ); |
| | 40 | + die( "Usage: checkoutMediaWiki.php X.XXwmfX php-X.XX\n" ); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | # The url to SVN to checkout from |
| — | — | @@ -57,7 +57,7 @@ |
| 58 | 58 | passthru( "svn checkout $source $destIP", $retval ); |
| 59 | 59 | if ( $retval !== 0 ) { |
| 60 | 60 | rmdir( $destIP ); // rollback |
| 61 | | - die( "\nUnable to checkout SVN path." ); |
| | 61 | + die( "\nUnable to checkout SVN path.\n" ); |
| 62 | 62 | } |
| 63 | 63 | print "...SVN checkout done.\n"; |
| 64 | 64 | |
| Index: trunk/tools/mwmultiversion/multiversion/populateWikiversionCDB.php |
| — | — | @@ -1,6 +1,6 @@ |
| 2 | 2 | <?php |
| 3 | 3 | if ( php_sapi_name() !== 'cli' ) { |
| 4 | | - die( 'This script can only be run from the command line.' ); |
| | 4 | + die( "This script can only be run from the command line.\n" ); |
| 5 | 5 | } |
| 6 | 6 | |
| 7 | 7 | error_reporting( E_ALL ); |
| — | — | @@ -26,7 +26,7 @@ |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | if ( !$argsValid ) { |
| 30 | | - die( "Usage: populateWikiVersionsCDB.php php-X.XX" ); |
| | 30 | + die( "Usage: populateWikiVersionsCDB.php php-X.XX\n" ); |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | $path = '/home/wikipedia/common/all.dblist'; |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | |
| 44 | 44 | $path = '/home/wikipedia/common/wikiversions.cdb'; |
| 45 | 45 | if ( !file_put_contents( $path, $wikiVersionList ) ) { |
| 46 | | - die( "Unable to write to wikiversions.cdb." ); |
| | 46 | + die( "Unable to write to wikiversions.cdb.\n" ); |
| 47 | 47 | } |
| 48 | 48 | } |
| 49 | 49 | |
| Index: trunk/tools/mwmultiversion/multiversion/MWScript.php |
| — | — | @@ -1,6 +1,6 @@ |
| 2 | 2 | <?php |
| 3 | 3 | if ( php_sapi_name() !== 'cli' ) { |
| 4 | | - exit; // sanity, script run via CLI |
| | 4 | + die( "This script can only be run from the command line.\n" ); |
| 5 | 5 | } |
| 6 | 6 | |
| 7 | 7 | error_reporting( E_ALL ); |
| — | — | @@ -22,7 +22,7 @@ |
| 23 | 23 | function runMWScript() { |
| 24 | 24 | global $argv; |
| 25 | 25 | if ( count( $argv ) < 2 ) { |
| 26 | | - die( "The MediaWiki script file path must be the first argument." ); |
| | 26 | + die( "The MediaWiki script file path must be the first argument.\n" ); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | $relFile = $argv[1]; // the script file to run |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | require_once( dirname( __FILE__ ) . '/../wmf-config/MWVersion.php' ); |
| 44 | 44 | $file = getMediaWikiCli( $relFile ); |
| 45 | 45 | if ( !file_exists( $file ) ) { |
| 46 | | - die( "The MediaWiki script file \"{$file}\" does not exist." ); |
| | 46 | + die( "The MediaWiki script file \"{$file}\" does not exist.\n" ); |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | # Run the script! (for HipHip, we will need to shell out here) |