From 7ff1395b96317bdc28a8dffd2351a4d9368e218a Mon Sep 17 00:00:00 2001 From: sprengm Date: Fri, 24 Aug 2012 17:55:19 +0200 Subject: [PATCH] make setup.php fail early on missing osm-file make setup.php fail early if: - no osm-file argument was supplied for --all or --import-data - the supplied osm-file is not existing or not readable (file permissions) --- utils/setup.php | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/utils/setup.php b/utils/setup.php index 049ef860..1db725c4 100755 --- a/utils/setup.php +++ b/utils/setup.php @@ -43,6 +43,26 @@ $bDidSomething = false; + // Check if osm-file is set and points to a valid file if --all or --import-data is given + if ($aCMDResult['import-data'] || $aCMDResult['all']) + { + if (!isset($aCMDResult['osm-file'])) + { + fail('missing --osm-file for data import'); + } + + if (!file_exists($aCMDResult['osm-file'])) + { + fail('the path supplied to --osm-file does not exist'); + } + + if (!is_readable($aCMDResult['osm-file'])) + { + fail('osm-file "'.$aCMDResult['osm-file'].'" not readable'); + } + } + + // This is a pretty hard core default - the number of processors in the box - 1 $iInstances = isset($aCMDResult['threads'])?$aCMDResult['threads']:(getProcessorCount()-1); if ($iInstances < 1) @@ -89,9 +109,9 @@ passthru('createdb -E UTF-8 '.$aDSNInfo['database']); } - if ($aCMDResult['create-db'] || $aCMDResult['all']) + if ($aCMDResult['setup-db'] || $aCMDResult['all']) { - echo "Create DB (2)\n"; + echo "Setup DB\n"; $bDidSomething = true; // TODO: path detection, detection memory, etc. -- 2.39.5