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 fd50bc52f531eade29083c2d9dc1c974003e9039..8aeedcc6c72ea5dffe38a06a16922f1c407c2e80 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.
-# 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
 
@@ -144,13 +144,20 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
 if [ "x$1" == "xyes" ]; then  #DOCS:
 
     cd $USERHOME
-    git clone --recursive git://github.com/twain47/Nominatim.git
+    git clone --recursive git://github.com/openstreetmap/Nominatim.git
 #DOCS:    cd Nominatim
 
 else                               #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: