use tmp_path fixture in config tests

[nominatim.git] / lib-php / admin / setup.php

diff --git a/lib-php/admin/setup.php b/lib-php/admin/setup.php
index 3aa6b828d15c336e102018a4c6cb6f4774a6171d..f8e360bb59f3f086f2af45131a8fa827aad03caf 100644 (file)
--- a/lib-php/admin/setup.php
+++ b/lib-php/admin/setup.php
@@ -57,23 +57,24 @@ setupHTTPProxy();
 $bDidSomething = false;
 
 $oNominatimCmd = new \Nominatim\Shell(getSetting('NOMINATIM_TOOL'));
 $bDidSomething = false;
 
 $oNominatimCmd = new \Nominatim\Shell(getSetting('NOMINATIM_TOOL'));

-if (isset($aCMDResult['quiet']) && $aCMDResult['quiet']) {
-    $oNominatimCmd->addParams('--quiet');
-}
-if ($aCMDResult['verbose']) {
-    $oNominatimCmd->addParams('--verbose');
-}

 
 // by default, use all but one processor, but never more than 15.
 $iInstances = max(1, $aCMDResult['threads'] ?? (min(16, getProcessorCount()) - 1));
 
 
 // by default, use all but one processor, but never more than 15.
 $iInstances = max(1, $aCMDResult['threads'] ?? (min(16, getProcessorCount()) - 1));
 

-function run($oCmd) {
+function run($oCmd)
+{

     global $iInstances;
     global $aCMDResult;
     $oCmd->addParams('--threads', $iInstances);
     if ($aCMDResult['ignore-errors'] ?? false) {
         $oCmd->addParams('--ignore-errors');
     }
     global $iInstances;
     global $aCMDResult;
     $oCmd->addParams('--threads', $iInstances);
     if ($aCMDResult['ignore-errors'] ?? false) {
         $oCmd->addParams('--ignore-errors');
     }

+    if ($aCMDResult['quiet'] ?? false) {
+        $oCmd->addParams('--quiet');
+    }
+    if ($aCMDResult['verbose'] ?? false) {
+        $oCmd->addParams('--verbose');
+    }

     $oCmd->run(true);
 }
 
     $oCmd->run(true);
 }