X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4b0ac5356ea453881437061ff5ac0261cd5a3243..9e21c6a8621661f0641a40875b1093b85adc68d1:/vagrant/Install-on-Ubuntu-20.sh?ds=sidebyside diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh index 85a95c9b..a7029be2 100644 --- a/vagrant/Install-on-Ubuntu-20.sh +++ b/vagrant/Install-on-Ubuntu-20.sh @@ -6,7 +6,6 @@ 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-20.sh. # @@ -19,9 +18,9 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: # #DOCS: :::sh - sudo apt-get \ - -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" \ - --allow-downgrades --allow-remove-essential --allow-change-held-packages \ + sudo apt-get \ #DOCS: + -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" \ #DOCS: + --allow-downgrades --allow-remove-essential --allow-change-held-packages \ #DOCS: -fuy install grub-pc #DOCS: sudo apt-get update -qq @@ -36,12 +35,6 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: php-intl python3-setuptools python3-dev python3-pip \ python3-psycopg2 python3-tidylib git -# If you want to run the test suite, you need to install the following -# additional packages: - - sudo apt-get install -y phpunit php-codesniffer php-cgi - - pip3 install --user behave nose # # System Configuration # ==================== @@ -169,4 +162,4 @@ EOF # Nominatim is now ready to use. Continue with -# [importing a database from OSM data](../admin/Import-and-Update.md). +# [importing a database from OSM data](../admin/Import.md).