From 2c53891f94ada7b7447543eadd40a8db9f5d8e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 19 Mar 2024 10:06:23 +0100 Subject: [PATCH 1/3] full_replace=1 in upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 7e8df4d..b9e1bbe 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,7 +18,7 @@ source /usr/share/yunohost/helpers ynh_script_progression --message="Upgrading source files..." --weight=9 # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$install_dir/app" +ynh_setup_source --dest_dir="$install_dir/app" --full_replace=1 --keep="sites" chmod -R o-rwx "$install_dir" chown -R "$app:www-data" "$install_dir" From 54e3867bd89fed1c83805d0691ad1680b2a5cbdc Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Mon, 1 Apr 2024 20:26:20 +0200 Subject: [PATCH 2/3] Update manifest.toml: fix upstream repo to be consitent with the main source and hopefully fix autoupdater --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 823181f..a4f2089 100644 --- a/manifest.toml +++ b/manifest.toml @@ -14,7 +14,7 @@ maintainers = [] [upstream] license = "GPL-2.0-only" website = "https://framaforms.org" -code = "https://framagit.org/framasoft/framaforms" +code = "https://framagit.org/yakforms/yakforms" fund = "https://soutenir.framasoft.org" [integration] From 35486d303d9127cb27d6def46818245802d05c73 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 1 Apr 2024 18:26:23 +0000 Subject: [PATCH 3/3] Auto-update READMEs --- ALL_README.md | 5 +++++ README.md | 15 ++++++++------- README_eu.md | 43 +++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 27 ++++++++++++++------------- 4 files changed, 70 insertions(+), 20 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_eu.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..3eeb161 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,5 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Irakurri README euskaraz](README_eu.md) +- [Lire le README en français](README_fr.md) diff --git a/README.md b/README.md index a5f2916..01f5e9a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,29 +9,30 @@ It shall NOT be edited by hand. [![Install Framaforms with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=framaforms) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install Framaforms 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 Framaforms 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 Framaforms is an online forms and surveys service. Registered users are allowed to create forms, share them, collect and visualize results through a simple interface. See this [article](https://framablog.org/2016/10/05/framaforms-noffrez-plus-les-reponses-que-vous-collectez-a-google/) and this [interview](https://framablog.org/2016/10/05/en-savoir-un-peu-plus-sur-le-projet-framaforms/) (in French) for further informations. + **Shipped version:** 1.0.3~ynh4 ## Documentation and resources - Official app website: -- Upstream app code repository: +- 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/framaforms_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/framaforms_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: ```bash sudo yunohost app install https://github.com/YunoHost-Apps/framaforms_ynh/tree/testing --debug diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..ad7d54e --- /dev/null +++ b/README_eu.md @@ -0,0 +1,43 @@ + + +# Framaforms YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/framaforms.svg)](https://dash.yunohost.org/appci/app/framaforms) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/framaforms.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/framaforms.maintain.svg) + +[![Instalatu Framaforms YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=framaforms) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Framaforms YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Framaforms is an online forms and surveys service. Registered users are allowed to create forms, share them, collect and visualize results through a simple interface. +See this [article](https://framablog.org/2016/10/05/framaforms-noffrez-plus-les-reponses-que-vous-collectez-a-google/) and this [interview](https://framablog.org/2016/10/05/en-savoir-un-peu-plus-sur-le-projet-framaforms/) (in French) for further informations. + + +**Paketatutako bertsioa:** 1.0.3~ynh4 +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/framaforms_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/framaforms_ynh/tree/testing --debug +edo +sudo yunohost app upgrade framaforms -u https://github.com/YunoHost-Apps/framaforms_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 1b78e37..a25404d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # Framaforms pour YunoHost @@ -9,29 +9,30 @@ It shall NOT be edited by hand. [![Installer Framaforms avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=framaforms) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Framaforms 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 Framaforms 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 Framaforms is an online forms and surveys service. Registered users are allowed to create forms, share them, collect and visualize results through a simple interface. See this [article](https://framablog.org/2016/10/05/framaforms-noffrez-plus-les-reponses-que-vous-collectez-a-google/) and this [interview](https://framablog.org/2016/10/05/en-savoir-un-peu-plus-sur-le-projet-framaforms/) (in French) for further informations. -**Version incluse :** 1.0.3~ynh4 + +**Version incluse :** 1.0.3~ynh4 ## Documentations et ressources -- Site officiel de l’app : -- Dépôt de code officiel de l’app : -- YunoHost Store : -- Signaler un bug : +- Site officiel de l’app : +- 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/framaforms_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/framaforms_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : ```bash sudo yunohost app install https://github.com/YunoHost-Apps/framaforms_ynh/tree/testing --debug @@ -39,4 +40,4 @@ ou sudo yunohost app upgrade framaforms -u https://github.com/YunoHost-Apps/framaforms_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** +**Plus d’infos sur le packaging d’applications :**