Merge remote-tracking branch 'upstream/master'

[nominatim.git] / vagrant / install-on-centos-7.sh

diff --git a/vagrant/install-on-centos-7.sh b/vagrant/install-on-centos-7.sh
index 62e718e5d8c9c9074938c392e8ec04d43070d566..8b283ef63f1b7af7b953f54a91828f6459bb5ea5 100755 (executable)
--- a/vagrant/install-on-centos-7.sh
+++ b/vagrant/install-on-centos-7.sh
@@ -7,7 +7,7 @@
 # ================================
 #
 # These instructions expect that you have a freshly installed CentOS version 7.
 # ================================
 #
 # These instructions expect that you have a freshly installed CentOS version 7.

-# Make sure all packages are are up-to-date by running:
+# Make sure all packages are up-to-date by running:

 #
     sudo yum update -y
 
 #
     sudo yum update -y
 


@@ -21,7 +21,7 @@
 
     sudo yum install -y postgresql-server postgresql-contrib postgresql-devel postgis postgis-utils \
                         git cmake make gcc gcc-c++ libtool policycoreutils-python \
 
     sudo yum install -y postgresql-server postgresql-contrib postgresql-devel postgis postgis-utils \
                         git cmake make gcc gcc-c++ libtool policycoreutils-python \

-                        php-pgsql php php-pear php-pear-DB libpqxx-devel proj-epsg \
+                        php-pgsql php php-pear php-pear-DB php-intl libpqxx-devel proj-epsg \

                         bzip2-devel proj-devel geos-devel libxml2-devel boost-devel expat-devel zlib-devel
 
 # If you want to run the test suite, you need to install the following
                         bzip2-devel proj-devel geos-devel libxml2-devel boost-devel expat-devel zlib-devel
 
 # If you want to run the test suite, you need to install the following


@@ -151,6 +151,13 @@ else                               #DOCS:
     cd $USERHOME                   #DOCS:
 fi                                 #DOCS:
 
     cd $USERHOME                   #DOCS:
 fi                                 #DOCS:
 

+# When installing the latest source from github, you also need to
+# download the country grid:
+
+if [ ! -f data/country_osm_grid.sql.gz ]; then       #DOCS:
+    wget -O data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz
+fi                                 #DOCS:
+

 # The code must be built in a separate directory. Create this directory,
 # then configure and build Nominatim in there:
 
 # The code must be built in a separate directory. Create this directory,
 # then configure and build Nominatim in there: