From 68457bbd5d3bd653aa114f92ea64e40ccc34aa80 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 5 Apr 2021 23:50:32 +0200 Subject: [PATCH] Fix linter warnings --- README.md | 19 +++++++------------ README_fr.md | 18 +++++++----------- manifest.json | 16 ++++------------ scripts/install | 11 ++++++----- scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- 6 files changed, 28 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index 50c0d13..4986ad4 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Mopidy for YunoHost [![Integration level](https://dash.yunohost.org/integration/mopidy.svg)](https://dash.yunohost.org/appci/app/mopidy) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.maintain.svg) -[![Install mopidy with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mopidy) +[![Install Mopidy with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mopidy) *[Lire ce readme en français.](./README_fr.md)* @@ -9,8 +9,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview -Mopidy - is an extensible music server. -It plays music, podcasts and radio programs from local disk and various streaming services. You edit the playlist from any phone, tablet, or computer. +Mopidy - is an extensible music server. It plays music, podcasts and radio programs from local disk and various streaming services. You edit the playlist from any phone, tablet, or computer. **Shipped version:** 3.1.1 @@ -42,13 +41,13 @@ This installation is shipped with various extensions: #### Multi-user support -Are LDAP and HTTP auth supported? No \ -Can the app be used by multiple users? ?? +* Are LDAP and HTTP auth supported? **No** +* Can the app be used by multiple users? ?? #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mopidy%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/mopidy/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mopidy%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mopidy/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps.yunohost.org/ci/apps/mopidy/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mopidy/) ## Limitations @@ -57,12 +56,9 @@ Can the app be used by multiple users? ?? ## Additional information * To list current settings enter `sudo mopidyctl config`. -* Edit the file `/opt/yunohost/mopidy/mopidy.conf` to adjust mopidy's configuration. +* Edit the file `/opt/yunohost/mopidy/mopidy.conf` to adjust Mopidy's configuration. * To rebuild the database of your local music collection enter `sudo mopidyctl local scan`. -**More info on the documentation page:** -https://yunohost.org/packaging_apps - ## Links * Report a bug: https://github.com/YunoHost-Apps/mopidy_ynh/issues @@ -73,7 +69,6 @@ https://yunohost.org/packaging_apps ## Developer info -**Only if you want to use a testing branch for coding, instead of merging directly into master.** Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing). To try the testing branch, please proceed like that. diff --git a/README_fr.md b/README_fr.md index 0146670..62c6aa8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Mopidy pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/mopidy.svg)](https://dash.yunohost.org/appci/app/mopidy) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.maintain.svg) -[![Installer mopidy avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mopidy) +[![Installer Mopidy avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mopidy) *[Read this readme in english.](./README.md)* @@ -9,8 +9,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* ## Vue d'ensemble -Mopidy - est un serveur de musique extensible. -Mopidy lit de la musique, des podcasts et des programmes de radio à partir d'un disque local et de divers services de streaming. +Mopidy - est un serveur de musique extensible. Mopidy lit de la musique, des podcasts et des programmes de radio à partir d'un disque local et de divers services de streaming. Vous pouvez modifier la liste de lecture à partir d'un téléphone, d'une tablette ou d'un ordinateur. **Version incluse :** 3.1.1 @@ -40,17 +39,18 @@ Cette installation est livrée avec différentes extensions: ## Documentation * Documentation officielle : https://docs.mopidy.com/en/latest/ + ## Caractéristiques spécifiques YunoHost #### Support multi-utilisateur -* L'authentification LDAP et HTTP est-elle prise en charge ? Non +* L'authentification LDAP et HTTP est-elle prise en charge ? **Non** * L'application peut-elle être utilisée par plusieurs utilisateurs ? #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mopidy%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/mopidy/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mopidy%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mopidy/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps.yunohost.org/ci/apps/mopidy/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mopidy/) ## Limitations @@ -59,12 +59,9 @@ Cette installation est livrée avec différentes extensions: ## Informations additionnelles * Pour lister les paramètres actuels, entrez `sudo mopidyctl config` -* Modifiez le fichier /opt/yunohost/mopidy/mopidy.conf pour ajuster la configuration de mopidy +* Modifiez le fichier `/opt/yunohost/mopidy/mopidy.conf` pour ajuster la configuration de mopidy * Pour reconstruire la base de données de votre collection de musique locale, entrez `sudo mopidyctl local scan` -**Plus d'informations sur la page de documentation :** -https://yunohost.org/packaging_apps - ## Liens * Signaler un bug : https://github.com/YunoHost-Apps/mopidy_ynh/issues @@ -75,7 +72,6 @@ https://yunohost.org/packaging_apps ## Informations pour les développeurs -**Seulement si vous voulez utiliser une branche de test pour le codage, au lieu de fusionner directement dans la banche principale.** Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. diff --git a/manifest.json b/manifest.json index 841ec86..3adfb72 100644 --- a/manifest.json +++ b/manifest.json @@ -17,7 +17,7 @@ "email": "cyp@rouquin.me" }, "requirements": { - "yunohost": ">= 4.0.8" + "yunohost": ">= 4.1.7" }, "multi_instance": false, "services": [ @@ -28,29 +28,21 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain name for Mopidy" - }, "example": "example.com" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for Mopidy" - }, "example": "/example", "default": "/mopidy" }, { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public application?" + "help": { + "en": "Public app can be used by anonymous visitors", + "fr": "L'application publique peut être utilisée par des visiteurs anonymes " }, - "help": { - "en": "public app can be used by anonymous visitors" - }, "default": false } ] diff --git a/scripts/install b/scripts/install index c129528..346e3a8 100755 --- a/scripts/install +++ b/scripts/install @@ -66,7 +66,8 @@ ynh_app_setting_set --app=$app --key=port --value=$port # INSTALL DEPENDENCIES #================================================= ynh_script_progression --message="Installing dependencies..." --weight=30 -ynh_install_app_dependencies $pkg_dependencies + +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER @@ -151,7 +152,7 @@ chown $app: $final_path #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --log_type systemd --description "this is mopidy, a music server" +yunohost service add $app --description "Mopidy music server" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE @@ -188,9 +189,9 @@ ynh_systemd_action --service_name=nginx --action=reload ynh_script_progression --message="Provide additional shell comand..." cp -a ../sources/extra_files/mopidyctl "$cmd_file" -ynh_replace_string --match_string="__APP__" --replace_string=$app --target_file="$cmd_file" -ynh_replace_string --match_string="__FINAL_PATH__" --replace_string=$final_path --target_file="$cmd_file" -ynh_replace_string --match_string="__CONF_FILE__" --replace_string=$conf_file --target_file="$cmd_file" +ynh_replace_string --match_string="__APP__" --replace_string=$app --target_file="$cmd_file" +ynh_replace_string --match_string="__FINAL_PATH__" --replace_string=$final_path --target_file="$cmd_file" +ynh_replace_string --match_string="__CONF_FILE__" --replace_string=$conf_file --target_file="$cmd_file" chmod +x "$cmd_file" diff --git a/scripts/restore b/scripts/restore index d6f4608..14d277d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -89,7 +89,7 @@ ynh_restore_file --origin_path="$final_path" # /opt/yunohost/mopidy ynh_script_progression --message="Reinstalling dependencies..." --weight=50 # Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE SYSTEMD @@ -104,7 +104,7 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --log_type systemd --description "this is mopidy, a music server" +yunohost service add $app --description "Mopidy music server" --log="/var/log/$app/$app.log" #================================================= # RESTORE VARIOUS FILES diff --git a/scripts/upgrade b/scripts/upgrade index c9579fc..8061c26 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -102,7 +102,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading dependencies..." --weight=11 -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER @@ -162,7 +162,7 @@ chown $app: $final_path #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --log_type systemd --description "this is mopidy, a music server" +yunohost service add $app --description "Mopidy music server" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE