X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7dbbc43a85dd6c46110493e63256149cbc89491c..4057b21e1f73e539d4b0c581200b8365691e63f6:/utils/setup.php

diff --git a/utils/setup.php b/utils/setup.php
index a203db7b..ed4b79c0 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -95,7 +95,7 @@
 		{
 			fail('database already exists ('.CONST_Database_DSN.')');
 		}
-		passthru('createdb -E UTF-8 '.$aDSNInfo['database']);
+		passthruCheckReturn('createdb -E UTF-8 '.$aDSNInfo['database']);
 	}
 
 	if ($aCMDResult['setup-db'] || $aCMDResult['all'])
@@ -109,6 +109,7 @@
 		$pgver = (float) CONST_Postgresql_Version;
 		if ($pgver < 9.1) {
 			pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/hstore.sql');
+			pgsqlRunScriptFile(CONST_BasePath.'/sql/hstore_compatability_9_0.sql');
 		} else {
 			pgsqlRunScript('CREATE EXTENSION hstore');
 		}
@@ -510,7 +511,6 @@
 		pg_query($oDB->connection, 'TRUNCATE import_status');
 		$sSQL = "INSERT INTO import_status VALUES('".$aRepMatch[2]."')";
 		pg_query($oDB->connection, $sSQL);
-		exit;
 	}
 
 	if ($aCMDResult['index'] || $aCMDResult['all'])
@@ -568,8 +568,11 @@
 		@symlink(CONST_BasePath.'/website/reverse.php', $sTargetDir.'/reverse.php');
 		@symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/search.php');
 		@symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/index.php');
+		@symlink(CONST_BasePath.'/website/deletable.php', $sTargetDir.'/deletable.php');
+		@symlink(CONST_BasePath.'/website/polygons.php', $sTargetDir.'/polygons.php');
 		@symlink(CONST_BasePath.'/website/images', $sTargetDir.'/images');
 		@symlink(CONST_BasePath.'/website/js', $sTargetDir.'/js');
+		@symlink(CONST_BasePath.'/website/css', $sTargetDir.'/css');
 		echo "Symlinks created\n";
 	}