From 6de49b7e67ebb933e6f46b09c981542d223f4ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 11 Jun 2022 10:12:38 +0200 Subject: [PATCH] Testing (#42) * 3.3.1 --- README.md | 19 ++++++++++--------- README_fr.md | 25 +++++++++++++++---------- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 2 +- 5 files changed, 29 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 048dcd8..0bea444 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Grocy for YunoHost -[![Integration level](https://dash.yunohost.org/integration/grocy.svg)](https://dash.yunohost.org/appci/app/grocy) ![](https://ci-apps.yunohost.org/ci/badges/grocy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/grocy.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/grocy.svg)](https://dash.yunohost.org/appci/app/grocy) ![Working status](https://ci-apps.yunohost.org/ci/badges/grocy.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/grocy.maintain.svg) [![Install Grocy with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grocy) *[Lire ce readme en français.](./README_fr.md)* @@ -17,13 +17,13 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in grocy is a web-based self-hosted groceries & household management solution for your home. -**Shipped version:** 3.3.0~ynh1 +**Shipped version:** 3.3.1~ynh1 **Demo:** https://en.demo.grocy.info/stockoverview ## Screenshots -![](./doc/screenshots/stock-en.png) +![Screenshot of Grocy](./doc/screenshots/stock-en.png) ## Disclaimers / important information @@ -41,20 +41,21 @@ grocy is a web-based self-hosted groceries & household management solution for y ## Documentation and resources -* Official app website: https://grocy.info/ -* Upstream app code repository: https://github.com/grocy/grocy -* YunoHost documentation for this app: https://yunohost.org/app_grocy -* Report a bug: https://github.com/YunoHost-Apps/grocy_ynh/issues +* Official app website: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/grocy_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug or sudo yunohost app upgrade grocy -u https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 98f530f..9a74fc2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Grocy pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/grocy.svg)](https://dash.yunohost.org/appci/app/grocy) ![](https://ci-apps.yunohost.org/ci/badges/grocy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/grocy.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/grocy.svg)](https://dash.yunohost.org/appci/app/grocy) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/grocy.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/grocy.maintain.svg) [![Installer Grocy avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grocy) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Grocy 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.* @@ -13,13 +17,13 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour grocy is a web-based self-hosted groceries & household management solution for your home. -**Version incluse :** 3.3.0~ynh1 +**Version incluse :** 3.3.1~ynh1 **Démo :** https://en.demo.grocy.info/stockoverview ## Captures d'écran -![](./doc/screenshots/stock-en.png) +![Capture d'écran de Grocy](./doc/screenshots/stock-en.png) ## Avertissements / informations importantes @@ -37,20 +41,21 @@ Connexion par défaut ## Documentations et ressources -* Site officiel de l'app : https://grocy.info/ -* Dépôt de code officiel de l'app : https://github.com/grocy/grocy -* Documentation YunoHost pour cette app : https://yunohost.org/app_grocy -* Signaler un bug : https://github.com/YunoHost-Apps/grocy_ynh/issues +* Site officiel de l'app : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/grocy_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug ou sudo yunohost app upgrade grocy -u https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** diff --git a/conf/app.src b/conf/app.src index 3a06008..4a7ad74 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/grocy/grocy/releases/download/v3.3.0/grocy_3.3.0.zip -SOURCE_SUM=cb497457e71321f658b7257c97a91d156f54cc959bede40c12871a3e8ed32db8 +SOURCE_URL=https://github.com/grocy/grocy/releases/download/v3.3.1/grocy_3.3.1.zip +SOURCE_SUM=5ea8d80e16bdc307c84c40d166c9c7fe283ef6ad7f49f288c10620d6cbd46973 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 64c3255..4894a05 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web-based groceries & household management solution for your home", "fr": "Solution Web de gestion d'épicerie et de gestion de la maison" }, - "version": "3.3.0~ynh1", + "version": "3.3.1~ynh1", "url": "https://grocy.info", "upstream": { "license": "MIT", diff --git a/scripts/_common.sh b/scripts/_common.sh index e0fc39e..111643a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ YNH_PHP_VERSION="8.0" -pkg_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl" +pkg_dependencies="php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl" #================================================= # PERSONAL HELPERS