bdd: move external process execution in separate func

[nominatim.git] / utils / country_languages.php

diff --git a/utils/country_languages.php b/utils/country_languages.php
old mode 100755 (executable)
new mode 100644 (file)
index 19ad25b..1a7ea61
--- a/utils/country_languages.php
+++ b/utils/country_languages.php
@@ -1,8 +1,6 @@
-#!/usr/bin/php -Cq

 <?php
 
 <?php
 

-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
-require_once(CONST_BasePath.'/lib/init-cmd.php');
+require_once(CONST_LibDir.'/init-cmd.php');

 
 ini_set('memory_limit', '800M');
 ini_set('display_errors', 'stderr');
 
 ini_set('memory_limit', '800M');
 ini_set('display_errors', 'stderr');


@@ -13,10 +11,12 @@ $aCMDOptions
     array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
     array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
     array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
     array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
     array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
     array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),

+    array('project-dir', '', 0, 1, 1, 1, 'realpath', 'Base directory of the Nominatim installation (default: .)'),

    );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
    );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 

-include(CONST_InstallPath.'/settings/phrase_settings.php');
+loadSettings($aCMDResult['project-dir'] ?? getcwd());
+setupHTTPProxy();

 
 if (true) {
     $sURL = 'https://wiki.openstreetmap.org/wiki/Special:Export/Nominatim/Country_Codes';
 
 if (true) {
     $sURL = 'https://wiki.openstreetmap.org/wiki/Special:Export/Nominatim/Country_Codes';