From 187f2ae98bddd8304edd29efd8643f9b5cb58121 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 5 Sep 2021 17:04:01 +0200
Subject: [PATCH] Fix

---
 manifest.json   | 10 +++++-----
 scripts/install | 10 +---------
 scripts/restore |  2 +-
 scripts/upgrade | 12 ++----------
 4 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/manifest.json b/manifest.json
index 71bfe8f..c4e743c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -56,7 +56,7 @@
 				"type": "boolean",
 				"ask": {
 					"en": "Enable end-to-bridge encryption?",
-					"fr": "Activer le chiffrement entre synapse et le bridge ?"
+					"fr": "Activer le chiffrement entre Synapse et le bridge ?"
 				},
 				"help": {
 					"en": "Only activate if you know the prerequisites and constraints related to e2b.",
@@ -103,7 +103,7 @@
 				"default": "",
 				"help": {
 					"en": "Get your own API keys at https://my.telegram.org/apps",
-					"fr": "TODO"
+					"fr": "Obtenez vos propres clés API sur https://my.telegram.org/apps"
 				}
 			},
 			{
@@ -111,7 +111,7 @@
 				"type": "string",
 				"ask": {
 					"en": "Telegram API keys (https://my.telegram.org/apps): Hash",
-					"fr": "TODO"
+					"fr": "Clés API Telegram (https://my.telegram.org/apps) : Hash"
 				},
 				"example": "tjyd5yge35lbodk1xwzw2jstp90k55qz",
 				"default": "",
@@ -125,13 +125,13 @@
 				"type": "string",
 				"ask": {
 					"en": "Telegram bot token (optional)",
-					"fr": "TODO"
+					"fr": "Jeton de bot de Telegram (facultatif) "
 				},
 				"example": "disabled",
 				"default": "disabled",
 				"help": {
 					"en": "Create your own telegram bot.",
-					"fr": "TODO"
+					"fr": "Créez votre propre bot de Telegram."
 				}
 			}
 		]
diff --git a/scripts/install b/scripts/install
index 99a480e..4612da4 100755
--- a/scripts/install
+++ b/scripts/install
@@ -108,15 +108,7 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 #=================================================
 ynh_script_progression --message="Installing dependencies..." --weight=97
 
-### `ynh_install_app_dependencies` allows you to add any "apt" dependencies to the package.
-### Those deb packages will be installed as dependencies of this package.
-### If you're not using this helper:
-###		- Remove the section "REMOVE DEPENDENCIES" in the remove script
-###		- Remove the variable "pkg_dependencies" in _common.sh
-###		- As well as the section "REINSTALL DEPENDENCIES" in the restore script
-###		- And the section "UPGRADE DEPENDENCIES" in the upgrade script
-
-ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CREATE A POSTGRESQL DATABASE
diff --git a/scripts/restore b/scripts/restore
index 923e0cc..448afa0 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -78,7 +78,7 @@ chown $mautrix_bridge_user:root -R $final_path
 ynh_script_progression --message="Reinstalling dependencies..." --weight=1
 
 # Define and install dependencies
-ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 # TODO
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 87da889..8536cfa 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -36,18 +36,10 @@ bottoken=$(ynh_app_setting_get --app=$app --key=bottoken)
 upstream_version=$(ynh_app_setting_get --app=$app --key=mautrix_version)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
-
-
 #=================================================
 # CHECK VERSION
 #=================================================
 
-### This helper will compare the version of the currently installed app and the version of the upstream package.
-### $upgrade_type can have 2 different values
-### - UPGRADE_APP if the upstream app version has changed
-### - UPGRADE_PACKAGE if only the YunoHost package has changed
-### ynh_check_app_version_changed will stop the upgrade if the app is up to date.
-### UPGRADE_APP should be used to upgrade the core app only if there's an upgrade to do.
 upgrade_type=$(ynh_check_app_version_changed)
 
 #=================================================
@@ -113,7 +105,7 @@ fi
 #=================================================
 ynh_script_progression --message="Upgrading dependencies..." --weight=1
 
-ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CREATE DEDICATED USER
@@ -135,7 +127,7 @@ ynh_script_progression --message="Upgrading python packages..." --weight=1
 $final_path/bin/pip3 install --upgrade setuptools wheel # HACK fixes "error: invalid command 'bdist_wheel'"
 $final_path/bin/pip3 install --upgrade $final_path/src/mautrix-telegram.tar.gz[postgres,speedups,qr_login] #,hq_thumbnails
 fi
-#
+
 #=================================================
 # SETUP SYSTEMD
 #=================================================