vagrant: download country data into correct directory

diff --git a/VAGRANT.md b/VAGRANT.md
index 7a891f1c8a1f6e8298e0d6477c6322d76272c05b..9ea1ec663448a24d329f8f50fa0ee1139650db87 100644 (file)
--- a/VAGRANT.md
+++ b/VAGRANT.md
@@ -47,7 +47,6 @@ is.
       # inside the virtual machine:
       mkdir data
       cd build
       # inside the virtual machine:
       mkdir data
       cd build

-      wget -O /home/vagrant/Nominatim/data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz

       wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf
       ./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log
       ```
       wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf
       ./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log
       ```

diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh
index 04b2f0413a07d788bf688c4120b35def37336d85..36d3ea4a45fe0959ee68b879a91db1baf68185c0 100755 (executable)
--- a/vagrant/Install-on-Centos-7.sh
+++ b/vagrant/Install-on-Centos-7.sh
@@ -145,10 +145,10 @@ if [ "x$1" == "xyes" ]; then  #DOCS:
 
     cd $USERHOME
     git clone --recursive git://github.com/openstreetmap/Nominatim.git
 
     cd $USERHOME
     git clone --recursive git://github.com/openstreetmap/Nominatim.git

-#DOCS:    cd Nominatim
+    cd Nominatim

 
 else                               #DOCS:
 
 else                               #DOCS:

-    cd $USERHOME                   #DOCS:
+    cd $USERHOME/Nominatim         #DOCS:

 fi                                 #DOCS:
 
 # When installing the latest source from github, you also need to
 fi                                 #DOCS:
 
 # When installing the latest source from github, you also need to


@@ -161,6 +161,7 @@ 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:
 

+    cd $USERHOME                   #DOCS:

     mkdir build
     cd build
     cmake $USERHOME/Nominatim
     mkdir build
     cd build
     cmake $USERHOME/Nominatim

diff --git a/vagrant/Install-on-Ubuntu-16.sh b/vagrant/Install-on-Ubuntu-16.sh
index 14ee16825bf67cb6bc961364188e46e94ac4aef5..28e38be9513f6da976721c12279e45ee77a08ae8 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-16.sh
+++ b/vagrant/Install-on-Ubuntu-16.sh
@@ -132,10 +132,10 @@ if [ "x$1" == "xyes" ]; then  #DOCS:
 
     cd $USERHOME
     git clone --recursive git://github.com/openstreetmap/Nominatim.git
 
     cd $USERHOME
     git clone --recursive git://github.com/openstreetmap/Nominatim.git

-#DOCS:    cd Nominatim
+    cd Nominatim

 
 else                               #DOCS:
 
 else                               #DOCS:

-    cd $USERHOME                   #DOCS:
+    cd $USERHOME/Nominatim         #DOCS:

 fi                                 #DOCS:
 
 # When installing the latest source from github, you also need to
 fi                                 #DOCS:
 
 # When installing the latest source from github, you also need to


@@ -148,6 +148,7 @@ 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:
 

+    cd $USERHOME                   #DOCS:

     mkdir build
     cd build
     cmake $USERHOME/Nominatim
     mkdir build
     cd build
     cmake $USERHOME/Nominatim

diff --git a/vagrant/install-on-travis-ci.sh b/vagrant/install-on-travis-ci.sh
index ec0a92dabd4b6ab128c8a9e1c0e29f68e10247cb..983571856e07c8469034a246dc15167cb260f7b5 100755 (executable)
--- a/vagrant/install-on-travis-ci.sh
+++ b/vagrant/install-on-travis-ci.sh
@@ -45,7 +45,7 @@ EOFAPACHECONF
 sudo a2enconf nominatim
 sudo service apache2 restart
 
 sudo a2enconf nominatim
 sudo service apache2 restart
 

-wget -O data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz
+wget -O $TRAVIS_BUILD_DIR/data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz

 
 mkdir build
 cd build
 
 mkdir build
 cd build