X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6577be3744c64f2381f9a52d53d4204db412665e..b2f3cfde0bb3d6a02e248272c3101970d7cfeb2e:/utils/update.php diff --git a/utils/update.php b/utils/update.php index b207fd6c..fd361eb8 100755 --- a/utils/update.php +++ b/utils/update.php @@ -3,8 +3,10 @@ require_once(dirname(dirname(__FILE__)).'/settings/settings.php'); require_once(CONST_BasePath.'/lib/init-cmd.php'); +include_once(CONST_BasePath.'/lib/setup_functions.php'); ini_set('memory_limit', '800M'); + # (long-opt, short-opt, min-occurs, max-occurs, num-arguments, num-arguments, type, help) $aCMDOptions @@ -99,12 +101,7 @@ if ($aResult['init-updates']) { fail('pyosmium-get-changes not found or not usable'); } if (!$aResult['no-update-functions']) { - $sSetup = CONST_InstallPath.'/utils/setup.php'; - $iRet = -1; - passthru(@PHP_BIN@.' --create-functions --enable-diff-updates', $iRet); - if ($iRet != 0) { - fail('Error running setup script'); - } + createFunctions($aCMDResult); } $sDatabaseDate = getDatabaseDate($oDB);