Tiger 2017 data no longer contains -divroad- field

[nominatim.git] / vagrant / Install-on-Ubuntu-16.sh

diff --git a/vagrant/Install-on-Ubuntu-16.sh b/vagrant/Install-on-Ubuntu-16.sh
index 14ee16825bf67cb6bc961364188e46e94ac4aef5..9c58d06324c4850e127f5485089bebfac8896f3c 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-16.sh
+++ b/vagrant/Install-on-Ubuntu-16.sh
@@ -33,7 +33,8 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 # If you want to run the test suite, you need to install the following
 # additional packages:
 
-    sudo apt-get install -y python3-dev python3-pip python3-psycopg2 python3-tidylib phpunit
+    sudo apt-get install -y python3-setuptools python3-dev python3-pip \
+                            python3-psycopg2 python3-tidylib phpunit php-cgi
 
     pip3 install --user behave nose # urllib3
     sudo pear install PHP_CodeSniffer
@@ -132,10 +133,10 @@ if [ "x$1" == "xyes" ]; then  #DOCS:
 
     cd $USERHOME
     git clone --recursive git://github.com/openstreetmap/Nominatim.git
-#DOCS:    cd Nominatim
+    cd Nominatim
 
 else                               #DOCS:
-    cd $USERHOME                   #DOCS:
+    cd $USERHOME/Nominatim         #DOCS:
 fi                                 #DOCS:
 
 # When installing the latest source from github, you also need to
@@ -148,6 +149,7 @@ fi                                 #DOCS:
 # 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