From df883739e33b2247511fc3ed0baaa61315b358c9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Aug 2022 19:01:22 +0200 Subject: [PATCH 1/4] set relative path for --keep opt --- manifest.json | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 160bbf0..cc17f9d 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ diff --git a/scripts/upgrade b/scripts/upgrade index 3ee35e5..c78b016 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -103,7 +103,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=7 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config.php" + ynh_setup_source --dest_dir="$final_path" --keep="config.php" fi chmod 750 "$final_path" From 0402993140dc1e709a1f8f148e2e4631e88195a7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 15 Aug 2022 17:01:29 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 20 +++++++++++--------- README_fr.md | 28 +++++++++++++++++----------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 52caba9..33a1e63 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # eLabFTW for YunoHost -[![Integration level](https://dash.yunohost.org/integration/elabftw.svg)](https://dash.yunohost.org/appci/app/elabftw) ![](https://ci-apps.yunohost.org/ci/badges/elabftw.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/elabftw.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/elabftw.svg)](https://dash.yunohost.org/appci/app/elabftw) ![Working status](https://ci-apps.yunohost.org/ci/badges/elabftw.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/elabftw.maintain.svg) [![Install eLabFTW with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=elabftw) *[Lire ce readme en français.](./README_fr.md)* @@ -21,32 +21,34 @@ It lets you store and organize your research experiments easily. It also feature **Shipped version:** 4.2.4~ynh1 + **Demo:** https://demo.elabftw.net/login.php ## Screenshots -![](./doc/screenshots/screen-1.jpg) +![Screenshot of eLabFTW](./doc/screenshots/screen-1.jpg) ## Disclaimers / important information Beware, starting with eLabFTW 4.3.0, upstream is moving away from manual installation for a full Docker installation, which will make updating th app more difficult... ## Documentation and resources -* Official app website: https://www.elabftw.net -* Official admin documentation: https://doc.elabftw.net/ -* Upstream app code repository: https://github.com/elabftw/elabftw -* YunoHost documentation for this app: https://yunohost.org/app_elabftw -* Report a bug: https://github.com/YunoHost-Apps/elabftw_ynh/issues +* Official app website: +* Official admin documentation: +* 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/elabftw_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/elabftw_ynh/tree/testing --debug or sudo yunohost app upgrade elabftw -u https://github.com/YunoHost-Apps/elabftw_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 450021e..eb52611 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # eLabFTW pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/elabftw.svg)](https://dash.yunohost.org/appci/app/elabftw) ![](https://ci-apps.yunohost.org/ci/badges/elabftw.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/elabftw.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/elabftw.svg)](https://dash.yunohost.org/appci/app/elabftw) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/elabftw.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/elabftw.maintain.svg) [![Installer eLabFTW avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=elabftw) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer eLabFTW 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.* @@ -15,34 +19,36 @@ eLabFTW is an electronic lab notebook manager for research teams. It lets you store and organize your research experiments easily. It also features a database where any kind of objects (such as antibodies, plasmids, cell lines, boxes, etc.) can be stored. It is accessed via the browser. Several research teams can be hosted on the same installation. This means eLabFTW can be installed at the institute level and host all team members at the same place. This is what is done at Institut Curie and in several other research centers around the globe. -**Version incluse :** 4.2.4~ynh1 +**Version incluse :** 4.2.4~ynh1 + **Démo :** https://demo.elabftw.net/login.php ## Captures d'écran -![](./doc/screenshots/screen-1.jpg) +![Capture d'écran de eLabFTW](./doc/screenshots/screen-1.jpg) ## Avertissements / informations importantes Beware, starting with eLabFTW 4.3.0, upstream is moving away from manual installation for a full Docker installation, which will make updating th app more difficult... ## Documentations et ressources -* Site officiel de l'app : https://www.elabftw.net -* Documentation officielle de l'admin : https://doc.elabftw.net/ -* Dépôt de code officiel de l'app : https://github.com/elabftw/elabftw -* Documentation YunoHost pour cette app : https://yunohost.org/app_elabftw -* Signaler un bug : https://github.com/YunoHost-Apps/elabftw_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* 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/elabftw_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/elabftw_ynh/tree/testing --debug ou sudo yunohost app upgrade elabftw -u https://github.com/YunoHost-Apps/elabftw_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 :** From c993f6877cfc08315a4fa87784a18a06738ea932 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 9 Oct 2022 11:17:29 +0200 Subject: [PATCH 3/4] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index cc17f9d..633abca 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source electronic lab notebook for research labs", "fr": "Cahier de laboratoire électronique open source pour les laboratoires de recherche" }, - "version": "4.2.4~ynh1", + "version": "4.2.4~ynh2", "url": "https://www.elabftw.net", "upstream": { "license": "AGPL-3.0-only", From 6481e3e8970de26cdd333fdb26cd20414a9fd903 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 9 Oct 2022 09:17:34 +0000 Subject: [PATCH 4/4] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 33a1e63..22d30a2 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,7 @@ eLabFTW is an electronic lab notebook manager for research teams. It lets you store and organize your research experiments easily. It also features a database where any kind of objects (such as antibodies, plasmids, cell lines, boxes, etc.) can be stored. It is accessed via the browser. Several research teams can be hosted on the same installation. This means eLabFTW can be installed at the institute level and host all team members at the same place. This is what is done at Institut Curie and in several other research centers around the globe. -**Shipped version:** 4.2.4~ynh1 - +**Shipped version:** 4.2.4~ynh2 **Demo:** https://demo.elabftw.net/login.php diff --git a/README_fr.md b/README_fr.md index eb52611..6075f8e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,8 +19,7 @@ eLabFTW is an electronic lab notebook manager for research teams. It lets you store and organize your research experiments easily. It also features a database where any kind of objects (such as antibodies, plasmids, cell lines, boxes, etc.) can be stored. It is accessed via the browser. Several research teams can be hosted on the same installation. This means eLabFTW can be installed at the institute level and host all team members at the same place. This is what is done at Institut Curie and in several other research centers around the globe. -**Version incluse :** 4.2.4~ynh1 - +**Version incluse :** 4.2.4~ynh2 **Démo :** https://demo.elabftw.net/login.php