phpcs fixes. Mostly spacing and single quotes

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

diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh
index 6c41b70c83bd307ff232872863821f3af3c109c8..d95f8d5368c656c1c6a371360355e5ca4d216544 100755 (executable)
--- a/vagrant/Install-on-Centos-7.sh
+++ b/vagrant/Install-on-Centos-7.sh
@@ -19,18 +19,21 @@
 
 # Now you can install all packages needed for Nominatim:
 
 
 # Now you can install all packages needed for Nominatim:
 

-    sudo yum install -y postgresql-server postgresql-contrib postgresql-devel postgis postgis-utils \
+#DOCS:    :::sh
+    sudo yum install -y postgresql-server postgresql-contrib postgresql-devel \
+                        postgis postgis-utils \

                         git cmake make gcc gcc-c++ libtool policycoreutils-python \
                         git cmake make gcc gcc-c++ libtool policycoreutils-python \

-                        php-pgsql php php-pear php-pear-DB php-intl libpqxx-devel proj-epsg \
-                        bzip2-devel proj-devel geos-devel libxml2-devel boost-devel expat-devel zlib-devel
+                        php-pgsql php php-pear php-pear-DB php-intl libpqxx-devel \
+                        proj-epsg bzip2-devel proj-devel libxml2-devel boost-devel \
+                        expat-devel zlib-devel

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

-    sudo yum install -y python-pip python-Levenshtein python-psycopg2 \
-                        python-numpy php-phpunit-PHPUnit
-    pip install --user --upgrade pip setuptools lettuce==0.2.18 six==1.9 \
-                                 haversine Shapely pytidylib
+#DOCS:    :::sh
+    sudo yum install -y python34-pip python34-setuptools python34-devel \
+                        php-phpunit-PHPUnit
+    pip3 install --user behave nose pytidylib psycopg2

     sudo pear install PHP_CodeSniffer
 
 #
     sudo pear install PHP_CodeSniffer
 
 #


@@ -77,7 +80,8 @@
 #
 # Next tune the postgresql configuration, which is located in 
 # `/var/lib/pgsql/data/postgresql.conf`. See section *Postgres Tuning* in
 #
 # Next tune the postgresql configuration, which is located in 
 # `/var/lib/pgsql/data/postgresql.conf`. See section *Postgres Tuning* in

-# [the installation page](Installation.md) for the parameters to change.
+# [the installation page](../admin/Installation.md#postgresql-tuning)
+# for the parameters to change.

 #
 # Now start the postgresql service after updating this config file.
 
 #
 # Now start the postgresql service after updating this config file.
 


@@ -99,7 +103,7 @@
 # You need to create an alias to the website directory in your apache
 # configuration. Add a separate nominatim configuration to your webserver:
 
 # You need to create an alias to the website directory in your apache
 # configuration. Add a separate nominatim configuration to your webserver:
 

-#DOCS:```
+#DOCS:```sh

 sudo tee /etc/httpd/conf.d/nominatim.conf << EOFAPACHECONF
 <Directory "$USERHOME/build/website"> #DOCS:<Directory "$USERHOME/Nominatim/build/website">
   Options FollowSymLinks MultiViews
 sudo tee /etc/httpd/conf.d/nominatim.conf << EOFAPACHECONF
 <Directory "$USERHOME/build/website"> #DOCS:<Directory "$USERHOME/Nominatim/build/website">
   Options FollowSymLinks MultiViews


@@ -141,12 +145,10 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
 #
 # Get the source code from Github and change into the source directory
 #
 #
 # Get the source code from Github and change into the source directory
 #

-if [ "x$1" == "xyes" ]; then  #DOCS:
-
+if [ "x$1" == "xyes" ]; then  #DOCS:    :::sh

     cd $USERHOME
     git clone --recursive git://github.com/openstreetmap/Nominatim.git
     cd Nominatim
     cd $USERHOME
     git clone --recursive git://github.com/openstreetmap/Nominatim.git
     cd Nominatim

-

 else                               #DOCS:
     cd $USERHOME/Nominatim         #DOCS:
 fi                                 #DOCS:
 else                               #DOCS:
     cd $USERHOME/Nominatim         #DOCS:
 fi                                 #DOCS:


@@ -154,14 +156,14 @@ fi                                 #DOCS:
 # When installing the latest source from github, you also need to
 # download the country grid:
 
 # When installing the latest source from github, you also need to
 # download the country grid:
 

-if [ ! -f data/country_osm_grid.sql.gz ]; then       #DOCS:
+if [ ! -f data/country_osm_grid.sql.gz ]; then       #DOCS:    :::sh

     wget -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
 fi                                 #DOCS:
 
 # The code must be built in a separate directory. Create this directory,
 # then configure and build Nominatim in there:
 
     wget -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
 fi                                 #DOCS:
 
 # The code must be built in a separate directory. Create this directory,
 # then configure and build Nominatim in there:
 

-    cd $USERHOME                   #DOCS:
+    cd $USERHOME                   #DOCS:    :::sh

     mkdir build
     cd build
     cmake $USERHOME/Nominatim
     mkdir build
     cd build
     cmake $USERHOME/Nominatim


@@ -170,7 +172,7 @@ fi                                 #DOCS:
 # You need to create a minimal configuration file that tells nominatim
 # the name of your webserver user and the URL of the website:
 
 # You need to create a minimal configuration file that tells nominatim
 # the name of your webserver user and the URL of the website:
 

-#DOCS:```
+#DOCS:```sh

 tee settings/local.php << EOF
 <?php
  @define('CONST_Database_Web_User', 'apache');
 tee settings/local.php << EOF
 <?php
  @define('CONST_Database_Web_User', 'apache');


@@ -180,4 +182,4 @@ EOF
 
 
 # Nominatim is now ready to use. Continue with
 
 
 # Nominatim is now ready to use. Continue with

-# [importing a database from OSM data](Import-and-Update.md).
+# [importing a database from OSM data](../admin/Import-and-Update.md).