safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Split of setup.php into one file with functions and one with the control of the workflow. The functions will also be included by update.php to avoid the passthru

Browse Source
This commit is contained in:
ThomasBarris
2018-08-22 21:06:55 +02:00
parent e286536959
commit 55fa051d3a
4 changed files with 963 additions and 855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/update.php
View File

@@ -3,6 +3,7 @@
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)
@@ -101,7 +102,11 @@ if ($aResult['init-updates']) {
if (!$aResult['no-update-functions']) {
$sSetup = CONST_InstallPath.'/utils/setup.php';
$iRet = -1;
passthru($sSetup.' --create-functions --enable-diff-updates', $iRet);
$aCMDResult['create-functions'] = true;
$aCMDResult['enable-diff-updates'] = true;
# passthru($sSetup.' --create-functions --enable-diff-updates', $iRet);
create_functions($aCMDResult);
if ($iRet != 0) {
fail('Error running setup script');
}