X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/55fa051d3a7019db62802f6bce29ab2a8f7e9657..57bf76a0e1d766bc90afcb8a748c5e25e7aa6f08:/utils/update.php diff --git a/utils/update.php b/utils/update.php index 038313f3..414fadb5 100755 --- a/utils/update.php +++ b/utils/update.php @@ -3,7 +3,6 @@ require_once(dirname(dirname(__FILE__)).'/settings/settings.php'); require_once(CONST_BasePath.'/lib/init-cmd.php'); -include_once(CONST_InstallPath.'/utils/setup_functions.php'); ini_set('memory_limit', '800M'); # (long-opt, short-opt, min-occurs, max-occurs, num-arguments, num-arguments, type, help) @@ -100,13 +99,9 @@ if ($aResult['init-updates']) { fail('pyosmium-get-changes not found or not usable'); } if (!$aResult['no-update-functions']) { - $sSetup = CONST_InstallPath.'/utils/setup.php'; + $sSetup ='@PHP_BIN@ '. CONST_InstallPath.'/utils/setup.php'; $iRet = -1; - $aCMDResult['create-functions'] = true; - $aCMDResult['enable-diff-updates'] = true; - # passthru($sSetup.' --create-functions --enable-diff-updates', $iRet); - create_functions($aCMDResult); - + passthru($sSetup.' --create-functions --enable-diff-updates', $iRet); if ($iRet != 0) { fail('Error running setup script'); }