From 18fd638d5f28d7b3a66b93c689ad85472436bd5b Mon Sep 17 00:00:00 2001 From: "kay (they/it)" Date: Mon, 31 Oct 2022 13:36:06 +0100 Subject: [PATCH 1/7] update to latest --- conf/app.src | 4 ++-- scripts/_common.sh | 4 ++-- scripts/install | 2 +- scripts/upgrade | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/app.src b/conf/app.src index 3b2ad45..00efad8 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://gitlab.com/mx-puppet/discord/mx-puppet-discord/-/archive/3c82530ac4978ae206f63634a319523e5bff299a/mx-puppet-discord-master.tar.gz -SOURCE_SUM=df351ace3788ad9c2d932bcdfc0ba691cd071575d7bd0f9180fbe6976dca5c42 +SOURCE_URL=https://gitlab.com/mx-puppet/discord/mx-puppet-discord/-/archive/fd4402268e9a8b942ca632f3337702862e06d24f/mx-puppet-discord-master.tar.gz +SOURCE_SUM=b0edc4dfe9d3670eb8b53dc229a8fd7fb794ada5fe1f3d3ba4c38b54ce5ca176 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/scripts/_common.sh b/scripts/_common.sh index c60db3d..c8e896e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,10 +5,10 @@ #================================================= # Node version -NODEJS_VERSION=16 +NODEJS_VERSION=12 # dependencies used by the app (must be on a single line) -pkg_dependencies="postgresql" +pkg_dependencies="postgresql libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 4b0f3dc..34ddbc5 100755 --- a/scripts/install +++ b/scripts/install @@ -128,7 +128,7 @@ ynh_script_progression --message="Building Node dependencies..." --weight=30 pushd "$final_path" ynh_use_nodejs - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=accept-new' npm install + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH npx yarn -- install popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 876bd2c..d9386cd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -108,7 +108,7 @@ ynh_script_progression --message="Building Node dependencies..." --weight=3 pushd "$final_path" ynh_use_nodejs - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=accept-new' npm install + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH npx yarn -- install popd #================================================= From 985c994a5d1f965fbc3e633b917bc54f3c2ba82e Mon Sep 17 00:00:00 2001 From: Florent Date: Wed, 2 Nov 2022 20:17:51 +0100 Subject: [PATCH 2/7] Fix install / upgrade --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 34ddbc5..5ebea9e 100755 --- a/scripts/install +++ b/scripts/install @@ -128,7 +128,7 @@ ynh_script_progression --message="Building Node dependencies..." --weight=30 pushd "$final_path" ynh_use_nodejs - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH npx yarn -- install + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH npx yarn install popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index d9386cd..0df0ba7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -108,7 +108,7 @@ ynh_script_progression --message="Building Node dependencies..." --weight=3 pushd "$final_path" ynh_use_nodejs - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH npx yarn -- install + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH npx yarn install popd #================================================= From bf7bb7e24f82cec447e10972ea3d49d5160416b7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 7 Nov 2022 10:02:33 +0000 Subject: [PATCH 3/7] Auto-update README --- README.md | 1 - README_fr.md | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 733ac35..5256a24 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,6 @@ See for documentation. **Shipped version:** 0.1.7~ynh3 - ## Screenshots ![Screenshot of Matrix-Discord bridge](./doc/screenshots/example.jpg) diff --git a/README_fr.md b/README_fr.md index 76f4863..c97a090 100644 --- a/README_fr.md +++ b/README_fr.md @@ -40,8 +40,7 @@ Ceci est une passerelle vers Discord pour Matrix. Il gère la messagerie privée Voir la documentation sur (en anglais). -**Version incluse :** 0.1.7~ynh3 - +**Version incluse :** 0.1.7~ynh3 ## Captures d'écran From 90a3231045879d79187549110530ee907911c3cf Mon Sep 17 00:00:00 2001 From: Florent Date: Mon, 7 Nov 2022 14:59:43 +0100 Subject: [PATCH 4/7] Bump to v0.1.7~ynh4 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 087ad8a..a4e7f29 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Discord puppeting bridge for Matrix/Synapse.", "fr": "Passerelle Discord pour Matrix/Synapse." }, - "version": "0.1.7~ynh3", + "version": "0.1.7~ynh4", "url": "https://gitlab.com/mx-puppet/discord/mx-puppet-discord", "upstream": { "license": "Apache-2.0", From a83bfd8651a09c124072a8961410b071251e98f0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 7 Nov 2022 14:00:21 +0000 Subject: [PATCH 5/7] 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 5256a24..78abd41 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ This is a discord puppeting bridge for matrix. It handles bridging private and g See for documentation. -**Shipped version:** 0.1.7~ynh3 +**Shipped version:** 0.1.7~ynh4 ## Screenshots diff --git a/README_fr.md b/README_fr.md index c97a090..e0e6476 100644 --- a/README_fr.md +++ b/README_fr.md @@ -40,7 +40,7 @@ Ceci est une passerelle vers Discord pour Matrix. Il gère la messagerie privée Voir la documentation sur (en anglais). -**Version incluse :** 0.1.7~ynh3 +**Version incluse :** 0.1.7~ynh4 ## Captures d'écran From 6426af0ea4490c84737fef37c5c465d31a2cf09c Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Sun, 10 Dec 2023 17:18:21 +0100 Subject: [PATCH 6/7] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index a4e7f29..74e11a7 100644 --- a/manifest.json +++ b/manifest.json @@ -20,7 +20,7 @@ "email": "florent.git@zeteo.me" }, "requirements": { - "yunohost": ">= 4.1.0" + "yunohost": ">= 11.1" }, "multi_instance": true, "services": [ From a39ae354ac46f7e92d8b2bea02ae112319e96688 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 10 Dec 2023 16:18:24 +0000 Subject: [PATCH 7/7] Auto-update README --- README.md | 5 +++-- README_fr.md | 23 ++++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 78abd41..d0a8604 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # Matrix-Discord bridge for YunoHost -[![Integration level](https://dash.yunohost.org/integration/matrix-puppet-discord.svg)](https://dash.yunohost.org/appci/app/matrix-puppet-discord) ![Working status](https://ci-apps.yunohost.org/ci/badges/matrix-puppet-discord.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/matrix-puppet-discord.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/matrix-puppet-discord.svg)](https://dash.yunohost.org/appci/app/matrix-puppet-discord) ![Working status](https://ci-apps.yunohost.org/ci/badges/matrix-puppet-discord.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/matrix-puppet-discord.maintain.svg) + [![Install Matrix-Discord bridge with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matrix-puppet-discord) *[Lire ce readme en français.](./README_fr.md)* @@ -57,7 +58,7 @@ You also may modify the `/etc/matrix-puppet-discord/user.config.yaml` file to cu * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index e0e6476..6d07401 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,16 @@ It shall NOT be edited by hand. # Matrix-Discord bridge pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/matrix-puppet-discord.svg)](https://dash.yunohost.org/appci/app/matrix-puppet-discord) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/matrix-puppet-discord.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/matrix-puppet-discord.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/matrix-puppet-discord.svg)](https://dash.yunohost.org/appci/app/matrix-puppet-discord) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/matrix-puppet-discord.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/matrix-puppet-discord.maintain.svg) + [![Installer Matrix-Discord bridge avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matrix-puppet-discord) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Matrix-Discord bridge rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer Matrix-Discord bridge rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble Ceci est une passerelle vers Discord pour Matrix. Il gère la messagerie privée ou en groupe, tout comme la discussion dans une guilde (serveur Discord). Le projet est basé sur [mx-puppet-bridge](https://gitlab.com/mx-puppet/mx-puppet-bridge). @@ -42,9 +43,9 @@ Voir la documentation sur -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : -* Documentation YunoHost pour cette app : +* Site officiel de l’app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs @@ -72,4 +73,4 @@ ou sudo yunohost app upgrade matrix-puppet-discord -u https://github.com/YunoHost-Apps/matrix-puppet-discord_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file