From 9710960ea3790fe58e23558db0613dfedccb8408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 20 May 2024 16:24:00 +0200 Subject: [PATCH 1/2] Use standard redis helpers --- manifest.toml | 2 +- scripts/_common.sh | 42 ------------------------------------------ 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5c3147f..88afafa 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,7 +20,7 @@ userdoc = "https://doc.endi.coop" code = "https://framagit.org/endi/endi" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.12" architectures = "all" multi_instance = true ldap = false diff --git a/scripts/_common.sh b/scripts/_common.sh index 028db67..96966d3 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -90,48 +90,6 @@ __ynh_python_venv_get_site_packages_dir() { "$venv_dir/bin/python3" -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])' } -#================================================= -# Redis HELPERS -#================================================= - -# get the first available redis database -# -# usage: ynh_redis_get_free_db -# | returns: the database number to use -ynh_redis_get_free_db() { - local result max db - result=$(redis-cli INFO keyspace) - - # get the num - max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+") - - db=0 - # default Debian setting is 15 databases - for i in $(seq 0 "$max") - do - if ! echo "$result" | grep -q "db$i" - then - db=$i - break 1 - fi - db=-1 - done - - test "$db" -eq -1 && ynh_die "No available Redis databases..." - - echo "$db" -} - -# Create a master password and set up global settings -# Please always call this script in install and restore scripts -# -# usage: ynh_redis_remove_db database -# | arg: database - the database to erase -ynh_redis_remove_db() { - local db=$1 - redis-cli -n "$db" flushall -} - #================================================= # EXPERIMENTAL HELPERS #================================================= From bf7cc7fd7470f53e77d3410b8d79f2864e1bdbeb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 20 May 2024 14:24:08 +0000 Subject: [PATCH 2/2] Auto-update READMEs --- ALL_README.md | 8 +++++++ README.md | 30 ++++++++++++------------- README_es.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++ README_eu.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 34 ++++++++++++++-------------- README_gl.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 268 insertions(+), 32 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_es.md create mode 100644 README_eu.md create mode 100644 README_gl.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..8938aae --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,8 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Lee el README en español](README_es.md) +- [Irakurri README euskaraz](README_eu.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 7cefbc3..be346d9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install enDI with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=endi) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install enDI quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install enDI quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview @@ -25,9 +25,9 @@ enDI is a business management software package. It is the management tool for ec - Support for the entrepreneurial journey and commercial activity of entrepreneurs -**Shipped version:** 6.5.4~ynh1 +**Shipped version:** 6.5.4~ynh2 -**Demo:** https://demo.endi.coop +**Demo:** ## Screenshots @@ -35,20 +35,20 @@ enDI is a business management software package. It is the management tool for ec ## Documentation and resources -* Official app website: -* Official user documentation: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official user documentation: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/endi_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/endi_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug or sudo yunohost app upgrade endi -u https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..13eb4a4 --- /dev/null +++ b/README_es.md @@ -0,0 +1,57 @@ + + +# enDI para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/endi.svg)](https://dash.yunohost.org/appci/app/endi) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/endi.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/endi.maintain.svg) + +[![Instalar enDI con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=endi) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarenDI rapidamente y simplement en un servidor YunoHost.* +> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.* + +## Descripción general + +enDI is a business management software package. It is the management tool for economic and social activity entirely dedicated to CAEs as well as to any company and group of independent entrepreneurs. + +### Features + +- Social management of entrepreneurs +- Social and statistical management of support for reporting to funders +- Support for the entrepreneurial journey and commercial activity of entrepreneurs + + +**Versión actual:** 6.5.4~ynh2 + +**Demo:** + +## Capturas + +![Captura de enDI](./doc/screenshots/accueil.png) + +## Documentaciones y recursos + +- Sitio web oficial: +- Documentación usuario oficial: +- Documentación administrador oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/endi_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug +o +sudo yunohost app upgrade endi -u https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..3bccc23 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,57 @@ + + +# enDI YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/endi.svg)](https://dash.yunohost.org/appci/app/endi) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/endi.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/endi.maintain.svg) + +[![Instalatu enDI YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=endi) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek enDI YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +enDI is a business management software package. It is the management tool for economic and social activity entirely dedicated to CAEs as well as to any company and group of independent entrepreneurs. + +### Features + +- Social management of entrepreneurs +- Social and statistical management of support for reporting to funders +- Support for the entrepreneurial journey and commercial activity of entrepreneurs + + +**Paketatutako bertsioa:** 6.5.4~ynh2 + +**Demoa:** + +## Pantaila-argazkiak + +![enDI(r)en pantaila-argazkia](./doc/screenshots/accueil.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Erabiltzaileen dokumentazio ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/endi_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug +edo +sudo yunohost app upgrade endi -u https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 5a16552..0c42cb8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # enDI pour YunoHost @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Installer enDI avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=endi) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer enDI 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 enDI rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble @@ -35,9 +35,9 @@ Il permet aux équipes d'appui une simplification, et une automatisation sur mes * Accompagnement du parcours entrepreneurial et de l'activité commerciale des entrepreneurs -**Version incluse :** 6.5.4~ynh1 +**Version incluse :** 6.5.4~ynh2 -**Démo :** https://demo.endi.coop +**Démo :** ## Captures d’écran @@ -45,23 +45,23 @@ Il permet aux équipes d'appui une simplification, et une automatisation sur mes ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle utilisateur : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle utilisateur : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/endi_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/endi_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug ou sudo yunohost app upgrade endi -u https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..fc039ce --- /dev/null +++ b/README_gl.md @@ -0,0 +1,57 @@ + + +# enDI para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/endi.svg)](https://dash.yunohost.org/appci/app/endi) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/endi.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/endi.maintain.svg) + +[![Instalar enDI con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=endi) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar enDI de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +enDI is a business management software package. It is the management tool for economic and social activity entirely dedicated to CAEs as well as to any company and group of independent entrepreneurs. + +### Features + +- Social management of entrepreneurs +- Social and statistical management of support for reporting to funders +- Support for the entrepreneurial journey and commercial activity of entrepreneurs + + +**Versión proporcionada:** 6.5.4~ynh2 + +**Demo:** + +## Capturas de pantalla + +![Captura de pantalla de enDI](./doc/screenshots/accueil.png) + +## Documentación e recursos + +- Web oficial da app: +- Documentación oficial para usuarias: +- Documentación oficial para admin: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/endi_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug +ou +sudo yunohost app upgrade endi -u https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..75eef49 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,57 @@ + + +# YunoHost 上的 enDI + +[![集成程度](https://dash.yunohost.org/integration/endi.svg)](https://dash.yunohost.org/appci/app/endi) ![工作状态](https://ci-apps.yunohost.org/ci/badges/endi.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/endi.maintain.svg) + +[![使用 YunoHost 安装 enDI](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=endi) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 enDI。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +enDI is a business management software package. It is the management tool for economic and social activity entirely dedicated to CAEs as well as to any company and group of independent entrepreneurs. + +### Features + +- Social management of entrepreneurs +- Social and statistical management of support for reporting to funders +- Support for the entrepreneurial journey and commercial activity of entrepreneurs + + +**分发版本：** 6.5.4~ynh2 + +**演示：** + +## 截图 + +![enDI 的截图](./doc/screenshots/accueil.png) + +## 文档与资源 + +- 官方应用网站： +- 官方用户文档： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/endi_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug +或 +sudo yunohost app upgrade endi -u https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：**