From c89e253a20c35a7bb8fcee6f645cc2109135f809 Mon Sep 17 00:00:00 2001
From: Geoffrey Brun <g.brun@pnr-millevaches.fr>
Date: Fri, 23 Sep 2022 15:08:55 +0200
Subject: [PATCH] Petites corrections

---
 docs/installation.md |  4 ++--
 install_db.sh        | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/installation.md b/docs/installation.md
index f5b5edf3..e6782b90 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -28,7 +28,7 @@ que `root`), `monuser` dans l'exemple :
 
 ```
 cd /home/<monuser>
-wget https://github.com/PnX-SI/GeoPaysages/archive/X.Y.Z.zip
+wget https://github.com/PnX-SI/GeoPaysages/archive/vX.Y.Z.zip
 ```
 
 > Si la commande `wget` renvoie une erreur liée au certificat, installer le paquet `ca-certificates` (`sudo apt-get install ca-certificates`) puis relancer la commande `wget` ci-dessus.
@@ -36,7 +36,7 @@ wget https://github.com/PnX-SI/GeoPaysages/archive/X.Y.Z.zip
 Dézipper l'archive :
 
 ```
-unzip X.Y.Z.zip
+unzip vX.Y.Z.zip
 ```
 
 Vous pouvez renommer le dossier qui contient l'application (dans un
diff --git a/install_db.sh b/install_db.sh
index 9e116e37..95d2ae4d 100755
--- a/install_db.sh
+++ b/install_db.sh
@@ -64,10 +64,10 @@ then
         wget https://raw.githubusercontent.com/PnX-SI/UsersHub/$usershub_release/data/usershub-data.sql -P /tmp
         wget https://raw.githubusercontent.com/PnX-SI/UsersHub/$usershub_release/data/usershub-dataset.sql -P /tmp
         cp install_configuration/usershub_adds.sql /tmp/usershub_adds.sql
-        export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -U $owner_geopaysages -d $db_name -f /tmp/usershub.sql &>> $DBLogFile
-        export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -U $owner_geopaysages -d $db_name -f /tmp/usershub-data.sql &>> $DBLogFile
-        export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -U $owner_geopaysages -d $db_name -f /tmp/usershub-dataset.sql &>> $DBLogFile
-        export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -U $owner_geopaysages -d $db_name -f /tmp/usershub_adds.sql &>> $DBLogFile
+        export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -p $db_port -U $owner_geopaysages -d $db_name -f /tmp/usershub.sql &>> $DBLogFile
+        export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -p $db_port -U $owner_geopaysages -d $db_name -f /tmp/usershub-data.sql &>> $DBLogFile
+        export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -p $db_port -U $owner_geopaysages -d $db_name -f /tmp/usershub-dataset.sql &>> $DBLogFile
+        export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -p $db_port -U $owner_geopaysages -d $db_name -f /tmp/usershub_adds.sql &>> $DBLogFile
     else
         echo "Connexion à la base Utilisateur..."
         cp install_configuration/usershub_fdw.sql /tmp/usershub_fdw.sql
@@ -79,11 +79,11 @@ then
         sed -i "s#\$usershub_user#$usershub_user#g" /tmp/usershub_fdw.sql
         sed -i "s#\$usershub_pass#$usershub_pass#g" /tmp/usershub_fdw.sql
         sudo -u postgres -s psql -d $db_name -f /tmp/usershub_fdw.sql  &>> $DBLogFile
-        export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -U $owner_geopaysages -d $db_name -f /tmp/usershub_fdw_import.sql &>> $DBLogFile
+        export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -p $db_port -U $owner_geopaysages -d $db_name -f /tmp/usershub_fdw_import.sql &>> $DBLogFile
     fi
 
     echo "Création de la BDD de GeoPaysages..."
-    export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -U $owner_geopaysages -d $db_name -f /tmp/oppdb.sql &>> $DBLogFile
+    export PGPASSWORD=$owner_geopaysages_pass;psql -h $db_host -p $db_port -U $owner_geopaysages -d $db_name -f /tmp/oppdb.sql &>> $DBLogFile
 
     echo "Fin... Vérifiez le fichier de log !"