From 691a6bac038e31b8fde97c0da681c5546ebc858d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 26 Jan 2021 14:19:38 +0100 Subject: [PATCH] Fix --- README_fr.md | 56 ++++++++++++++++++++++++------------------------- scripts/install | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 17 +++------------ 4 files changed, 35 insertions(+), 46 deletions(-) diff --git a/README_fr.md b/README_fr.md index a38666a..86d0482 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,70 +1,70 @@ # Matterbridge pour YunoHost -[![Integration level](https://dash.yunohost.org/integration/matterbridge.svg)](https://dash.yunohost.org/appci/app/matterbridge) ![](https://ci-apps.yunohost.org/ci/badges/matterbridge.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/matterbridge.maintain.svg) -[![Install matterbridge with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matterbridge) +[![Niveau d'intégration](https://dash.yunohost.org/integration/matterbridge.svg)](https://dash.yunohost.org/appci/app/matterbridge) ![](https://ci-apps.yunohost.org/ci/badges/matterbridge.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/matterbridge.maintain.svg) +[![Installer Matterbridge avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matterbridge) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this readme in english.](./README.md)* -> *This package allows you to install Matterbridge quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *Ce package vous permet d'installer Matterbridge rapidement et simplement sur un serveur YunoHost. +Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* -## Overview +## Vue d'ensemble Quick description of this app. -**Shipped version:** 1.21.0 +**Version incluse :** 1.21.0 -## Screenshots +## Captures d'écran ![](Link to a screenshot of this app.) -## Demo +## Démo -* [Official demo](Link to a demo site for this app.) +* [Démo officielle](Lien vers un site de démonstration de cette application.) ## Configuration -How to configure this app: From an admin panel, a plain file with SSH, or any other way. +Comment configurer cette application : via le panneau d'administration, un fichier brut en SSH ou tout autre moyen. ## Documentation - * Official documentation: Link to the official documentation of this app - * YunoHost documentation: If specific documentation is needed, feel free to contribute. + * Documentation officielle : Lien vers la documentation officielle de cette application. + * Documentation YunoHost : Si une documentation spécifique est nécessaire, n'hésitez pas à contribuer. -## YunoHost specific features +## Caractéristiques spécifiques YunoHost -#### Multi-user support +#### Support multi-utilisateur -Are LDAP and HTTP auth supported? -Can the app be used by multiple users? +* L'authentification LDAP et HTTP est-elle prise en charge ? +* L'application peut-elle être utilisée par plusieurs utilisateurs ? -#### Supported architectures +#### Architectures supportées * x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/matterbridge%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/matterbridge/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/matterbridge%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/matterbridge/) ## Limitations -* Any known limitations. +* Limitations connues. -## Additional information +## Informations additionnelles -* Other info you would like to add about this app. +* Autres informations que vous souhaitez ajouter sur cette application. ## Links - * Report a bug: https://github.com/YunoHost-Apps/matterbridge_ynh/issues - * Upstream app repository: https://github.com/42wim/matterbridge - * YunoHost website: https://yunohost.org/ + * Signaler un bug : https://github.com/YunoHost-Apps/matterbridge_ynh/issues + * Dépôt de l'application principale : https://github.com/42wim/matterbridge + * Site web YunoHost : https://yunohost.org/ --- -## Developer info +## Informations pour les développeurs -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/matterbridge_ynh/tree/testing). +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/matterbridge_ynh/tree/testing). -To try the testing branch, please proceed like that. +Pour essayer la branche testing, procédez comme suit. ``` sudo yunohost app install https://github.com/YunoHost-Apps/matterbridge_ynh/tree/testing --debug -or +ou sudo yunohost app upgrade matterbridge -u https://github.com/YunoHost-Apps/matterbridge_ynh/tree/testing --debug ``` diff --git a/scripts/install b/scripts/install index e27f7d2..0e8c608 100644 --- a/scripts/install +++ b/scripts/install @@ -79,9 +79,9 @@ ynh_add_systemd_config #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Multi-protocols bridge for online communications" --log="/var/log/$app/$app.log" #================================================= # GENERIC FINALIZATION diff --git a/scripts/restore b/scripts/restore index 68f5fe1..b0a1d50 100644 --- a/scripts/restore +++ b/scripts/restore @@ -70,9 +70,9 @@ systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Multi-protocols bridge for online communications" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index e385bc7..83048e0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,7 +70,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action=stop --log_path="/var/log/$app/$app.log" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -81,7 +81,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=2 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" fi #================================================= @@ -100,17 +100,6 @@ ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 # Create a dedicated systemd config ynh_add_systemd_config -#================================================= -# MODIFY A CONFIG FILE -#================================================= - -ynh_backup_if_checksum_is_different --file="$final_path/CONFIG_FILE" - -ynh_replace_string --match_string="match_string" --replace_string="replace_string" --target_file="$final_path/CONFIG_FILE" - -# Recalculate and store the checksum of the file for the next upgrade. -ynh_store_file_checksum --file="$final_path/CONFIG_FILE" - #================================================= # GENERIC FINALIZATION #================================================= @@ -126,7 +115,7 @@ chown -R $app: $final_path #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Multi-protocols bridge for online communications" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE