| Index: branches/lucene-search-2.1/src/org/wikimedia/lsearch/util/Configure.java |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | |
| 44 | 44 | if( ! new File(mediawiki+"/LocalSettings.php").exists() ){ |
| 45 | 45 | System.out.println("ERROR: "+mediawiki+" does not appear to contain a MediaWiki installation. "); |
| 46 | | - System.out.println("Please give full path to root directory (where LocaliseSettings.php is) of your MediWiki installation. "); |
| | 46 | + System.out.println("Please give full path to root directory (where LocalSettings.php is) of your MediWiki installation. "); |
| 47 | 47 | return; |
| 48 | 48 | } |
| 49 | 49 | |
| — | — | @@ -84,7 +84,7 @@ |
| 85 | 85 | return Command.exec(new String[] { |
| 86 | 86 | "/bin/bash", |
| 87 | 87 | "-c", |
| 88 | | - "cd "+mediawiki+" && (echo \"return \\$"+var+"\" | php maintenance/eval.php | sed -e 's/^> // ; /^$/d')"}).trim(); |
| | 88 | + "cd "+mediawiki+" && (echo \"return \\$"+var+"\" | php maintenance/eval.php --conf "+mediawiki+"/LocalSettings.php | sed -e 's/^> // ; /^$/d')"}).trim(); |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | /** create config file from template, replacing variables |