small fixes on setup.php and a bring update.php to work

[nominatim.git] / utils / imports.php

diff --git a/utils/imports.php b/utils/imports.php
index fce65ab9a5d28b4a86632a1aa7e6145764ac5d9c..9d1085f041e78ed5953c0ee6abc050f0273cf1e1 100755 (executable)
--- a/utils/imports.php
+++ b/utils/imports.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -Cq
+#!@PHP_BIN@ -Cq

 <?php
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 <?php
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');


@@ -7,7 +7,7 @@ ini_set('memory_limit', '800M');
 
 $aCMDOptions
  = array(
 
 $aCMDOptions
  = array(

-    "Create and setup nominatim search system",
+    'Create and setup nominatim search system',

     array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
     array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
     array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
     array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
     array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
     array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),


@@ -29,7 +29,7 @@ if (isset($aCMDResult['parse-tiger'])) {
         preg_match('#([0-9]{5})_(.*)#', basename($sImportFile), $aMatch);
         $sCountyID = $aMatch[1];
 
         preg_match('#([0-9]{5})_(.*)#', basename($sImportFile), $aMatch);
         $sCountyID = $aMatch[1];
 

-        echo "Processing ".$sCountyID."...\n";
+        echo 'Processing '.$sCountyID."...\n";

         $sUnzipCmd = "unzip -d $sTempDir $sImportFile";
         exec($sUnzipCmd);
 
         $sUnzipCmd = "unzip -d $sTempDir $sImportFile";
         exec($sUnzipCmd);