From 3b2625ae3e3d0cccc0674603ef71c6e6507e3d55 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 18 Sep 2022 13:41:03 +0200 Subject: [PATCH 1/4] Fix abort_if_up_to_date to allow force-upgrades --- scripts/ynh_package_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ynh_package_version b/scripts/ynh_package_version index d6cdc4d..0887f5f 100644 --- a/scripts/ynh_package_version +++ b/scripts/ynh_package_version @@ -14,7 +14,7 @@ read_manifest () { abort_if_up_to_date () { version=$(read_json "/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" 'version' 2> /dev/null || echo '20160501-7') last_version=$(read_manifest 'version') - if [ "${version}" = "${last_version}" ]; then + if [ "${version}" = "${last_version}" ] && [ "$YNH_APP_UPGRADE_TYPE" != "UPGRADE_FORCED" ]; then ynh_print_info "Up-to-date, nothing to do" ynh_die "" 0 fi From ab1b04c89dcc3ff2e4222de69bcefa887d15a17c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 18 Sep 2022 11:41:12 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 1 + README_fr.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0af630f..9623900 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post **Shipped version:** 2.4.3~ynh1 + **Demo:** http://distsn.org/pleroma-instances.html ## Screenshots diff --git a/README_fr.md b/README_fr.md index 82f0f39..c7199ca 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,8 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post **Mastodon web front-end for Pleroma:** Add **/web** in front of your Pleroma domain, eg. pleroma.domain.tld/web -**Version incluse :** 2.4.3~ynh1 +**Version incluse :** 2.4.3~ynh1 + **Démo :** http://distsn.org/pleroma-instances.html From 629cf4e426bf58a834a9c63076dcbe8054f62c41 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 18 Sep 2022 23:56:14 +0200 Subject: [PATCH 3/4] Upgrade to 2.4.3~ynh1 --- check_process | 2 ++ manifest.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index 24b4651..3a6307a 100644 --- a/check_process +++ b/check_process @@ -30,6 +30,8 @@ upgrade=1 from_commit=2c4a57afdc92a6428ccfea3ccb74c7e33dc9b9ff # 2.4.1~ynh1 upgrade=1 from_commit=e6d9935af254018baf326281662c55407170694d + # 2.4.3~ynh1 + upgrade=1 from_commit=ba16bc8bee7715c479a7ee575ec5f7d9970a84f8 backup_restore=1 multi_instance=0 port_already_use=0 diff --git a/manifest.json b/manifest.json index 9791a4d..753914f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A free, federated social networking server built on open protocols.", "fr": "Un serveur de réseautage social fédéré et gratuit basé sur des protocoles ouverts." }, - "version": "2.4.3~ynh1", + "version": "2.4.3~ynh2", "url": "https://pleroma.social/", "upstream": { "license": "AGPL-3.0-only", From 1f2182994500bba3081e753217c3117d358a7c0d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 18 Sep 2022 21:56:19 +0000 Subject: [PATCH 4/4] 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 9623900..1ad0455 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post **Mastodon web front-end for Pleroma:** Add **/web** in front of your Pleroma domain, eg. pleroma.domain.tld/web -**Shipped version:** 2.4.3~ynh1 +**Shipped version:** 2.4.3~ynh2 **Demo:** http://distsn.org/pleroma-instances.html diff --git a/README_fr.md b/README_fr.md index c7199ca..02c391a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post **Mastodon web front-end for Pleroma:** Add **/web** in front of your Pleroma domain, eg. pleroma.domain.tld/web -**Version incluse :** 2.4.3~ynh1 +**Version incluse :** 2.4.3~ynh2 **Démo :** http://distsn.org/pleroma-instances.html