Merge pull request #524 from mtmail/PSR2-function-declarations

[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 e077989fb41251738028dc5a38be888b612676d8..a4b9ddee8ad993bc8f14c8d7b18fb6e612f9c48b 100755 (executable)
--- a/vagrant/install-on-ubuntu-16.sh
+++ b/vagrant/install-on-ubuntu-16.sh
@@ -3,6 +3,9 @@
 # hacks for broken vagrant box      #DOCS:
 sudo rm -f /var/lib/dpkg/lock       #DOCS:
 sudo update-locale LANG=en_US.UTF-8 #DOCS:
+export APT_LISTCHANGES_FRONTEND=none #DOCS:
+export DEBIAN_FRONTEND=noninteractive #DOCS:
+
 #
 # *Note:* these installation instructions are also available in executable
 #         form for use with vagrant under vagrant/install-on-ubuntu-16.sh.
@@ -16,7 +19,7 @@ sudo update-locale LANG=en_US.UTF-8 #DOCS:
 #
 
     sudo apt-get update -qq
-    sudo apt-get upgrade -y
+    sudo apt-get -o Dpkg::Options::="--force-confnew" --force-yes -fuy dist-upgrade #DOCS:    sudo apt-get upgrade
 
 # Now you can install all packages needed for Nominatim:
 
@@ -35,6 +38,7 @@ sudo update-locale LANG=en_US.UTF-8 #DOCS:
                             python-numpy phpunit
 
     pip install --user lettuce==0.2.18 six==1.7 haversine
+    sudo pear install PHP_CodeSniffer
 
 #
 # System Configuration