From c66dad108c2be984497c5da79ae8f8740992fda0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 4 Dec 2020 14:07:23 +0100 Subject: [PATCH 1/5] Fix linter warnings --- scripts/backup | 1 - scripts/install | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 9 +-------- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/scripts/backup b/scripts/backup index 8640103..3aa23aa 100644 --- a/scripts/backup +++ b/scripts/backup @@ -29,7 +29,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= - ynh_print_info --message="Declaring files to be backed up..." #================================================= diff --git a/scripts/install b/scripts/install index 4e0b664..dfabc7a 100644 --- a/scripts/install +++ b/scripts/install @@ -152,7 +152,7 @@ chown -R $app: $config_path #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "Client Web IRC" --log_type "systemd" +yunohost service add $app --description="Client Web IRC" --log_type="systemd" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index 9fd5125..dc74ad5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -100,14 +100,14 @@ ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ st ynh_script_progression --message="Restoring the systemd configuration..." 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..." -yunohost service add $app --description "Client Web IRC" --log_type "systemd" +yunohost service add $app --description="Client Web IRC" --log_type="systemd" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 01bcc8d..0ef5e2e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,13 +71,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -path_url=$(ynh_normalize_url_path --path_url=$path_url) - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -186,7 +179,7 @@ chown -R $app: $config_path #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "Client Web IRC" --log_type "systemd" +yunohost service add $app --description="Client Web IRC" --log_type="systemd" #================================================= # START SYSTEMD SERVICE From a9c07f671e626373bf0c5e76db146492308d94ed Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 7 Dec 2020 10:09:47 +0100 Subject: [PATCH 2/5] Update check_process --- check_process | 4 ---- 1 file changed, 4 deletions(-) diff --git a/check_process b/check_process index 473a837..d5c5b3e 100644 --- a/check_process +++ b/check_process @@ -21,12 +21,8 @@ upgrade=1 from_commit=bd00c8e3ce43563f33fde073cf36b997c348d05c backup_restore=1 multi_instance=0 - incorrect_path=0 port_already_use=0 change_url=1 -;;; Levels - # If the level 5 (Package linter) is forced to 1. Please add justifications here. - Level 5=auto ;;; Options Email= Notification=none From 14941ee5bdc78bddee94346871c3cd14da04cb4a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 14 Dec 2020 11:14:10 +0100 Subject: [PATCH 3/5] Fix linter warnings --- manifest.json | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 6817174..69e5f62 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web IRC client", "fr": "Client Web IRC" }, - "version": "4.2.0~ynh1", + "version": "4.2.0~ynh2", "url": "https://thelounge.chat/", "license": "MIT", "maintainer": { diff --git a/scripts/install b/scripts/install index dfabc7a..e587e6b 100644 --- a/scripts/install +++ b/scripts/install @@ -152,7 +152,7 @@ chown -R $app: $config_path #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description="Client Web IRC" --log_type="systemd" +yunohost service add $app --description="Client Web IRC" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index dc74ad5..00611d4 100644 --- a/scripts/restore +++ b/scripts/restore @@ -107,7 +107,7 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description="Client Web IRC" --log_type="systemd" +yunohost service add $app --description="Client Web IRC" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 0ef5e2e..9ec59bc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -179,7 +179,7 @@ chown -R $app: $config_path #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description="Client Web IRC" --log_type="systemd" +yunohost service add $app --description="Client Web IRC" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE From df600f24f67363dea9629ac1e20f91cfe821f518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 17 Dec 2020 21:53:29 +0100 Subject: [PATCH 4/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ef90118..9c674c6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # The Lounge for YunoHost [![Integration level](https://dash.yunohost.org/integration/thelounge.svg)](https://dash.yunohost.org/appci/app/thelounge) ![](https://ci-apps.yunohost.org/ci/badges/thelounge.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/thelounge.maintain.svg) -[![Install The Lounge with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=thelounge) +[![Install The Lounge with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=thelounge) *[Lire ce readme en français.](./README_fr.md)* From 37029537930912859ff2bfb6d4989e23cf52b60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 26 Dec 2020 10:31:51 +0100 Subject: [PATCH 5/5] Use SVG for badge --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index a615e49..c717791 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # The Lounge pour YunoHost [![Niveau d’intégration](https://dash.yunohost.org/integration/thelounge.svg)](https://dash.yunohost.org/appci/app/thelounge) ![](https://ci-apps.yunohost.org/ci/badges/thelounge.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/thelounge.maintain.svg) -[![Installer The Lounge avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=thelounge) +[![Installer The Lounge avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=thelounge) *[Read this readme in english.](./README.md)*