Merge remote-tracking branch 'upstream/master'

[nominatim.git] / vagrant-provision.sh

diff --git a/vagrant-provision.sh b/vagrant-provision.sh
index 68e279c54eb52a9a0cc7eb5d91de64c1b38862f3..1a7702263ea4bb5a9cc32b59e26b3dd5aee5db6f 100755 (executable)
--- a/vagrant-provision.sh
+++ b/vagrant-provision.sh
@@ -29,10 +29,9 @@ USERNAME=vagrant
 
 sudo apt-get update -qq
 sudo apt-get upgrade -y
-# sudo apt-get install -y git-core screen
-sudo apt-get install -y build-essential libxml2-dev libgeos-dev libpq-dev libbz2-dev \
+sudo apt-get install -y build-essential libgeos-dev libpq-dev libbz2-dev \
                         libtool automake libproj-dev libboost-dev  libboost-system-dev \
-                        libboost-filesystem-dev libboost-thread-dev
+                        libboost-filesystem-dev libboost-thread-dev libexpat-dev
 sudo apt-get autoremove -y
 
 # get arrow-keys working in terminal (e.g. editing in vi)
@@ -62,8 +61,7 @@ sudo -u postgres createuser -s $USERNAME
 ###
 ### PHP for frontend
 ###
-sudo apt-get install -y php5 php5-pgsql php-pear 
-sudo pear install DB
+sudo apt-get install -y php5 php5-pgsql php-pear php-db
 
 
 # get rid of some warning
@@ -75,18 +73,19 @@ echo "date.timezone = 'Etc/UTC'" | sudo tee /etc/php5/cli/conf.d/99-timezone.ini
 ###
 ### Nominatim
 ###
-sudo apt-get install -y libprotobuf-c0-dev protobuf-c-compiler \
-                        libgeos-c1 libgeos++-dev \
-                        lua5.2 liblua5.2-dev
-
-# git clone --recursive https://github.com/twain47/Nominatim.git
-
+sudo apt-get install -y libgeos-c1 libgeos++-dev libxml2-dev
 
 # now ideally login as $USERNAME and continue
 su $USERNAME -l
-cd /home/vagrant/Nominatim
+cd /home/vagrant
+
+if [ ! -d "Nominatim" ]; then
+  sudo apt-get install -y git
+  git clone --recursive https://github.com/twain47/Nominatim.git
+fi
+
+cd Nominatim
 
-# cd ~/Nominatim
 ./autogen.sh
 ./configure
 make
@@ -156,15 +155,12 @@ sudo chown $USERNAME /var/www/nominatim
 ## Test suite (Python)
 ## https://github.com/twain47/Nominatim/tree/master/tests
 ##
-sudo apt-get install -y python-dev python-pip python-Levenshtein tidy
-sudo pip install lettuce nose pytidylib haversine psycopg2 shapely
+sudo apt-get install -y python-dev python-pip python-Levenshtein python-shapely \
+                        python-psycopg2 tidy python-nose python-tidylib
+sudo pip install lettuce==0.2.18 six==1.7 haversine
 
-##
 ## Test suite (PHP)
 ## https://github.com/twain47/Nominatim/tree/master/tests-php
-##
-wget --no-clobber -q https://phar.phpunit.de/phpunit.phar
-chmod +x phpunit.phar
-sudo mv phpunit.phar /usr/local/bin/phpunit
+sudo apt-get install -y phpunit