From 9c8bbbe3de7c0e66271ad94f3e3d1b4f8757f1e4 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 19 Mar 2021 19:35:03 +0100
Subject: [PATCH] Fix

---
 README.md       | 2 +-
 README_fr.md    | 2 +-
 manifest.json   | 2 +-
 scripts/install | 4 ++--
 scripts/upgrade | 3 ++-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 0dd001e..d0d76eb 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ If you don’t have YunoHost, please see [here](https://yunohost.org/#/install)
 Converse is a free and open-source XMPP chat client written in JavaScript which can be tightly integrated into any website.
 The benefit of using converse.js as opposed to relying on a SaaS (software-as-a-service) solution, is that your users can have a much more customized, streamlined and integrated webchat experience and that you have control over the data.
 
-**Shipped version:** 7.0.4
+**Shipped version:** 7.0.5
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 3d46f97..7d96a81 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -12,7 +12,7 @@ If you don’t have YunoHost, please see [here](https://yunohost.org/#/install)
 Converse est un client de chat XMPP open-source écrit en JavaScript qui peut être étroitement intégré à n'importe quel site Web.
 L'avantage d'utiliser converse.js par rapport à une solution SaaS (software-as-a-service), est que vos utilisateurs peuvent avoir une expérience de chat beaucoup plus personnalisée, rationalisée et intégrée et que vous avez le contrôle sur les données.
 
-**Version incluse :** 7.0.4
+**Version incluse :** 7.0.5
 
 ## Captures d’écran
 
diff --git a/manifest.json b/manifest.json
index 4c0bccf..9ab2369 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Web-based XMPP/Jabber chat client",
         "fr": "Client de chat XMPP/Jabber basé sur le Web"
     },
-     "version": "7.0.4~ynh4",
+     "version": "7.0.5~ynh1",
     "url": "http://conversejs.org/",
     "license": "MPL-2.0",
     "maintainer": {
diff --git a/scripts/install b/scripts/install
index 60364f3..4b8e439 100755
--- a/scripts/install
+++ b/scripts/install
@@ -43,8 +43,8 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 #=================================================
 ynh_script_progression --message="Storing installation settings..." --weight=2
 
-ynh_app_setting_set --app=$app --key=domain    --value=$domain
-ynh_app_setting_set --app=$app --key=path      --value=$path_url
+ynh_app_setting_set --app=$app --key=domain --value=$domain
+ynh_app_setting_set --app=$app --key=path --value=$path_url
 
 #=================================================
 # STANDARD MODIFICATIONS
diff --git a/scripts/upgrade b/scripts/upgrade
index f196c9e..2ef7ba6 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -70,7 +70,8 @@ then
 
 	# Download, the source from sources folder
 	mkdir -p $final_path && cp -a ../sources/* $final_path
-	ynh_replace_string --match_string="__DOMAIN____PATH__" --replace_string="$domain$path_url" --target_file="$final_path/index.html"
+	ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="$final_path/index.html"
+	ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$final_path/index.html"
 fi
 
 #=================================================