From c2047502bcc397be487abb8e674c3ce97014134f Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 29 Aug 2020 15:56:43 +0200
Subject: [PATCH] cleaning up

---
 README.md          |  2 +-
 README_fr.md       |  4 ++--
 scripts/change_url |  2 +-
 scripts/install    | 12 ++++++------
 scripts/upgrade    |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 2c1e5d5..b2b906b 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Can the app be used by multiple users? **No**
 
 #### Supported architectures
 
-* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/nodered%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/nodered/)
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/nodered%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/nodered/)
 * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/nodered%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/nodered/)
 
 ## Links
diff --git a/README_fr.md b/README_fr.md
index e3b7d5d..b3f291d 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 ## Vue d'ensemble
 Programmation par flux de données pour l'Internet des objets.
 
-**Version incluse:** 1.1.3
+**Version incluse :** 1.1.3
 
 ## Captures d'écran
 
@@ -28,7 +28,7 @@ La configuration, et l'installation de plugins tels que pour [Home-Assistant](ht
 
 ## Documentation
 
- * [Documentation officielle](https://nodered.org/docs/)
+ * Documentation officielle : https://nodered.org/docs/
 
 ## Caractéristiques spécifiques YunoHost
 
diff --git a/scripts/change_url b/scripts/change_url
index 9ad9368..2f5cad4 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -90,7 +90,7 @@ fi
 # ALTERED NODERED SETTINGS FILE
 #=================================================
 
-ynh_replace_string "httpRoot: '$old_path'," "httpRoot: '$new_path'," "$final_path/data/settings.js"
+ynh_replace_string --match_string="httpRoot: '$old_path'," --replace_string="httpRoot: '$new_path'," --target_file="$final_path/data/settings.js"
 
 #=================================================
 # GENERIC FINALISATION
diff --git a/scripts/install b/scripts/install
index 9cb5bba..b9bb4b1 100755
--- a/scripts/install
+++ b/scripts/install
@@ -96,7 +96,7 @@ popd
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring nginx web server..." --time --weight=30
+ynh_script_progression --message="Configuring nginx web server..." --weight=30
 
 # Create a dedicated nginx config
 ynh_add_nginx_config
@@ -106,8 +106,8 @@ ynh_add_nginx_config
 #=================================================
 mkdir -p $final_path/data
 cp $final_path/settings.js $final_path/data/settings.js
-ynh_replace_string "//httpRoot: '/red'," "httpRoot: '$path_url'," "$final_path/data/settings.js"
-ynh_replace_string "//ui: { path: "ui" }," "ui: { path: "/ui/" }," "$final_path/data/settings.js"
+ynh_replace_string --match_string="//httpRoot: '/red'," --replace_string="httpRoot: '$path_url'," --target_file="$final_path/data/settings.js"
+ynh_replace_string --match_string="//ui: { path: "ui" }," --replace_string="ui: { path: "/ui/" }," --target_file="$final_path/data/settings.js"
 
 #=================================================
 # SETUP SYSTEMD
@@ -115,9 +115,9 @@ ynh_replace_string "//ui: { path: "ui" }," "ui: { path: "/ui/" }," "$final_path/
 ynh_script_progression --message="Configuring a systemd service..." --weight=3
 
 # Set the systemd service settings
-ynh_replace_string "__PORT__" "$port" "../conf/systemd.service"
-ynh_replace_string "__NODEJS__" "$nodejs_version" "../conf/systemd.service"
-ynh_replace_string "__ENV_PATH__" "$PATH" "../conf/systemd.service"
+ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="../conf/systemd.service"
+ynh_replace_string --match_string="__NODEJS__" --replace_string="$nodejs_version" --target_file="../conf/systemd.service"
+ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service"
 
 # Create a dedicated systemd config
 ynh_add_systemd_config
diff --git a/scripts/upgrade b/scripts/upgrade
index 0726430..58f0ac5 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -124,8 +124,8 @@ ynh_add_nginx_config
 if [ ! -f $final_path/data/settings.js ]; then
     cp $final_path/settings.js $final_path/data/settings.js
 fi
-ynh_replace_string "//httpRoot: '/red'," "httpRoot: '$path_url'," "$final_path/data/settings.js"
-ynh_replace_string "//ui: { path: "ui" }," "ui: { path: "/ui/" }," "$final_path/data/settings.js"
+ynh_replace_string --match_string="//httpRoot: '/red'," --replace_string="httpRoot: '$path_url'," --target_file="$final_path/data/settings.js"
+ynh_replace_string --match_string="//ui: { path: "ui" }," --replace_string="ui: { path: "/ui/" }," --target_file="$final_path/data/settings.js"
 
 #=================================================
 # SETUP LOGROTATE