From 3496357008d3bc8e60f02efd3b4e3d641e580596 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 19 Dec 2020 11:00:54 +0100 Subject: [PATCH] Fix linter warnings --- README.md | 2 +- README_fr.md | 2 +- check_process | 2 -- issue_template.md | 4 ++-- manifest.json | 4 ++-- scripts/install | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 2 +- 8 files changed, 10 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 08900ef..3162f06 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # HedgeDoc for YunoHost [![Integration level](https://dash.yunohost.org/integration/hedgedoc.svg)](https://dash.yunohost.org/appci/app/hedgedoc) ![](https://ci-apps.yunohost.org/ci/badges/hedgedoc.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/hedgedoc.maintain.svg) -[![Install HedgeDoc with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=hedgedoc) +[![Install HedgeDoc with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hedgedoc) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index eec2501..7bea83d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # HedgeDoc pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/hedgedoc.svg)](https://dash.yunohost.org/appci/app/hedgedoc) ![](https://ci-apps.yunohost.org/ci/badges/hedgedoc.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/hedgedoc.maintain.svg) -[![Installer HedgeDoc avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=hedgedoc) +[![Installer HedgeDoc avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hedgedoc) *[Read this readme in english.](./README.md)* diff --git a/check_process b/check_process index 8e2f879..7d6d5cf 100644 --- a/check_process +++ b/check_process @@ -16,8 +16,6 @@ multi_instance=1 port_already_use=1 change_url=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none \ No newline at end of file diff --git a/issue_template.md b/issue_template.md index 2a70f73..481e34f 100644 --- a/issue_template.md +++ b/issue_template.md @@ -8,7 +8,7 @@ about: Create a report to help us debug, it would be nice to fill the template a 1. *Read this whole template first.* 2. *Determine if you are on the right place:* - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - - *Otherwise, the issue may be due to CodiMD itself. Refer to its documentation or repository for help.* + - *Otherwise, the issue may be due to HedgeDoc itself. Refer to its documentation or repository for help.* - *If you have a doubt, post here, we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* --- @@ -20,7 +20,7 @@ about: Create a report to help us debug, it would be nice to fill the template a - Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* - YunoHost version: x.x.x - I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* -- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* - If yes, please explain: - Using, or trying to install package version/branch: - If upgrading, current package version: *can be found in the admin, or with `yunohost app info hedgedoc`* diff --git a/manifest.json b/manifest.json index f7bf253..9ad958b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,14 @@ "en": "Collaborative editor to work on notes written in Markdown", "fr": "Éditeur collaboratif pour travailler sur des notes en Markdown" }, - "version": "1.6.0~ynh5", + "version": "1.6.0~ynh6", "url": "https://github.com/hedgedoc/hedgedoc", "license": "AGPL-3.0-only", "maintainer": { "name": "" }, "requirements": { - "yunohost": ">= 4.0.8" + "yunohost": ">= 4.0.0" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index a957b6a..390d925 100644 --- a/scripts/install +++ b/scripts/install @@ -178,7 +178,7 @@ chown -R $app:$app $final_path #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 -yunohost service add $app --description "Collaborative Markdown notes" --log="/var/log/$app/$app.log" +yunohost service add $app --description="collaborative Markdown editor" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index 49aceb0..6202cb3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -106,14 +106,14 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name ynh_script_progression --message="Restoring the systemd configuration..." --weight=5 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 -yunohost service add $app --description "collaborative Markdown editor" --log "/var/log/$app/$app.log" +yunohost service add $app --description="collaborative Markdown editor" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index dcfd276..a4f6aad 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -177,7 +177,7 @@ chown -R $app:$app $final_path #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 -yunohost service add $app --description "Collaborative Markdown notes" --log="/var/log/$app/$app.log" +yunohost service add $app --description="collaborative Markdown editor" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE