From 89b3802e14b3aedb818ac551f90b6df55b814e34 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 11 Dec 2021 12:11:24 +0100 Subject: [PATCH 1/5] Fix --- scripts/change_url | 2 +- scripts/install | 1 - scripts/restore | 3 +-- scripts/upgrade | 8 +------- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 6820df2..11fbeac 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -109,7 +109,7 @@ fi ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="Listening on port" +ynh_systemd_action --service_name=$app --action=start --log_path="systemd" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index af0c6c8..e2b373b 100644 --- a/scripts/install +++ b/scripts/install @@ -45,7 +45,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=architecture --value=$architecture #================================================= # STANDARD MODIFICATIONS diff --git a/scripts/restore b/scripts/restore index 06d3f63..35a28e2 100644 --- a/scripts/restore +++ b/scripts/restore @@ -35,8 +35,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS diff --git a/scripts/upgrade b/scripts/upgrade index 9336c1c..af79ffa 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,7 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) -architecture=$(ynh_app_setting_get --app=$app --key=architecture) +architecture=$YNH_ARCH #================================================= # CHECK VERSION @@ -34,12 +34,6 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -# If architecture doesn't exist, create it -if [ -z "$architecture" ]; then - architecture=$YNH_ARCH - architecture=$(ynh_app_setting_get --app=$app --key=architecture) -fi - # Cleaning legacy permissions if ynh_legacy_permissions_exists; then ynh_legacy_permissions_delete_all From 093e9e8914a36880a8f13a3bb0c44aa7425605fd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 11 Dec 2021 12:15:46 +0100 Subject: [PATCH 2/5] Update change_url --- scripts/change_url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/change_url b/scripts/change_url index 11fbeac..3f3a284 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -70,7 +70,7 @@ fi #================================================= 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="systemd" #================================================= # MODIFY URL IN NGINX CONF From d91bebdc35e4d6173aa2741be94cf480534a468c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 11 Dec 2021 12:17:33 +0100 Subject: [PATCH 3/5] Update DESCRITION.md --- doc/DESCRITION.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/DESCRITION.md b/doc/DESCRITION.md index f3b4247..95205b8 100644 --- a/doc/DESCRITION.md +++ b/doc/DESCRITION.md @@ -1,3 +1,5 @@ +Web-based IRC graphical client + ### Features - Searchable history From 714fbad323ae7848621a7dffef51d0e222b0b512 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 11 Dec 2021 15:05:20 +0100 Subject: [PATCH 4/5] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index fc07be6..7422cfc 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web-based IRC graphical client", "fr": "Client graphique IRC" }, - "version": "0.7~ynh2", + "version": "0.7~ynh3", "url": "https://github.com/khlieng/dispatch", "upstream": { "license": "AGPL-3.0-only", From bf420cab15fcfda90677d50b08e25757db7d4878 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 11 Dec 2021 14:05:27 +0000 Subject: [PATCH 5/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0386f23..1d01a30 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Web-based IRC graphical client -**Shipped version:** 0.7~ynh2 +**Shipped version:** 0.7~ynh3 **Demo:** https://dispatch.khlieng.com/ diff --git a/README_fr.md b/README_fr.md index bcdd382..99bade0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Client graphique IRC -**Version incluse :** 0.7~ynh2 +**Version incluse :** 0.7~ynh3 **Démo :** https://dispatch.khlieng.com/