remove name from geocodejson when not set

[nominatim.git] / vagrant / Install-on-Centos-8.sh

diff --git a/vagrant/Install-on-Centos-8.sh b/vagrant/Install-on-Centos-8.sh
index 9c4972dc50265c80a6f1ef5b28b8b3186d02764b..fdfec24b2f4ee52e09b91dfb95f6c0b55538f157 100755 (executable)
--- a/vagrant/Install-on-Centos-8.sh
+++ b/vagrant/Install-on-Centos-8.sh
@@ -32,20 +32,21 @@
                         llvm-toolset ccache clang-tools-extra \
                         php-pgsql php php-intl php-json libpq-devel \
                         proj52-epsg bzip2-devel proj-devel boost-devel \
                         llvm-toolset ccache clang-tools-extra \
                         php-pgsql php php-intl php-json libpq-devel \
                         proj52-epsg bzip2-devel proj-devel boost-devel \

+                        python3-pip python3-setuptools python3-devel \

                         expat-devel zlib-devel
 
     # make sure pg_config gets found
     echo 'PATH=/usr/pgsql-10/bin:$PATH' >> ~/.bash_profile
     source ~/.bash_profile
 
                         expat-devel zlib-devel
 
     # make sure pg_config gets found
     echo 'PATH=/usr/pgsql-10/bin:$PATH' >> ~/.bash_profile
     source ~/.bash_profile
 

+    pip3 install --user psycopg2 pytidylib
+

 # If you want to run the test suite, you need to install the following
 # additional packages:
 
 #DOCS:    :::sh
 # If you want to run the test suite, you need to install the following
 # additional packages:
 
 #DOCS:    :::sh

-    sudo dnf install -y python36 python3-pip python3-setuptools python36-devel \
-                        php-dom php-mbstring
-
-    pip3 install --user behave nose pytidylib psycopg2
+    sudo dnf install -y php-dom php-mbstring
+    pip3 install --user behave nose

 
     composer global require "squizlabs/php_codesniffer=*"
     sudo ln -s ~/.config/composer/vendor/bin/phpcs /usr/bin/
 
     composer global require "squizlabs/php_codesniffer=*"
     sudo ln -s ~/.config/composer/vendor/bin/phpcs /usr/bin/