From 9a9708f71964785e6a69c33f3ba27367a3595b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 25 Aug 2022 07:36:47 +0200 Subject: [PATCH] Testing (#142) * Auto-update README * Upgrade to upstream * Auto-update README * Bullseye (#141) * Fix * Fix * Auto-update README Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 4 ++-- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 7 +++---- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 58a93c7..718bb7d 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader an - flexible article filtering -**Shipped version:** 20220812~ynh1 +**Shipped version:** 20220824~ynh1 **Demo:** https://srv.tt-rss.org/tt-rss/ diff --git a/README_fr.md b/README_fr.md index ff1396e..ea8a932 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ Tiny Tiny RSS est un lecteur et agrégateur de flux de nouvelles (RSS/Atom) bas - filtrage flexible des articles -**Version incluse :** 20220812~ynh1 +**Version incluse :** 20220824~ynh1 **Démo :** https://srv.tt-rss.org/tt-rss/ diff --git a/conf/app.src b/conf/app.src index 60936b6..32ec4c3 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://git-gitea.tt-rss.org/fox/tt-rss/archive/ed2cbeffcc456a86726b52d37c977a35b895968c.tar.gz -SOURCE_SUM=a4a606b25a7c615089929fae5c247373787971b3879030a3247da0a52037743c +SOURCE_URL=https://git-gitea.tt-rss.org/fox/tt-rss/archive/c0e77241d34f494c98b877df655fc5a5c5a9cb14.tar.gz +SOURCE_SUM=4614f537e669177b0e57a34d4a1514126f1bb6a48ab4c675f0a0f633000c604a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 234fa19..d39b432 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "News feed (RSS/Atom) reader and aggregator", "fr": "Lecteur de flux d’actualité utilisant les protocoles RSS et Atom" }, - "version": "20220812~ynh1", + "version": "20220824~ynh1", "url": "http://tt-rss.org", "upstream": { "license": "GPL-3.0-only", @@ -21,7 +21,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index 75cd3f5..6ab4750 100644 --- a/scripts/install +++ b/scripts/install @@ -153,7 +153,7 @@ yunohost service add $app --description="News feed reader and aggregator" --log= ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index b4e26ec..99decab 100644 --- a/scripts/restore +++ b/scripts/restore @@ -114,7 +114,7 @@ yunohost service add $app --description="News feed reader and aggregator" --log= #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name=$app --action="start" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 30c77c5..676fdda 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,7 +27,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) @@ -53,7 +52,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." -ynh_systemd_action --service_name=$app --action="stop" +ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -154,7 +153,7 @@ then domain_path=https://$domain$path_url ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php" - ynh_script_progression --message="Upgrading ttrss database..." --weight=2 + ynh_script_progression --message="Upgrading the database..." --weight=2 ynh_exec_as $app php${phpversion} ${final_path}/update.php --update-schema=force-yes fi @@ -183,7 +182,7 @@ yunohost service add $app --description="News feed reader and aggregator" --log= #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # RELOAD NGINX