From 2e44020610ef80ad8b4a03e4184b9fdac0e01600 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sun, 15 Jan 2023 01:11:24 +0100 Subject: [PATCH 1/6] Update --- doc/DESCRIPTION.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 4e77be9..19241bf 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -11,4 +11,6 @@ It appeared that the pronunciation of "Garradin" in French is sometimes a bit co There is already a commercial software called "Garradin" in Australia, which does finance for large groups. For the moment this was not a problem because our association management solution was only available in French and until then did not have much scope. But we would like to be able to offer the software in other languages in the years to come, and as Garradin (the French project) is starting to be quite well known, it seems necessary to limit the risk of confusion in the future with this commercial solution. +You can now upgrade Garradin with Paheko ! + ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) From 6a6da12926fd89acb6bdcb6e04e412f7ddc4161c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 15 Jan 2023 00:11:27 +0000 Subject: [PATCH 2/6] Auto-update README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d78ff15..46b7ad2 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,8 @@ It appeared that the pronunciation of "Garradin" in French is sometimes a bit co There is already a commercial software called "Garradin" in Australia, which does finance for large groups. For the moment this was not a problem because our association management solution was only available in French and until then did not have much scope. But we would like to be able to offer the software in other languages in the years to come, and as Garradin (the French project) is starting to be quite well known, it seems necessary to limit the risk of confusion in the future with this commercial solution. +You can now upgrade Garradin with Paheko ! + ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) From 051ecd6d0f700d57fd0c14ec5ebadab941773cb4 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sun, 15 Jan 2023 01:12:30 +0100 Subject: [PATCH 3/6] Update --- doc/DESCRIPTION_fr.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index ff2bd73..16f89f6 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -6,5 +6,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie Il est apparu que la prononciation de "Garradin" en français est parfois un peu compliquée, de même que son orthographe. Il existe déjà un logiciel commercial nommé "Garradin" en Australie, qui fait de la finance pour de grands groupes. Pour le moment cela ne posait pas de problème car notre solution de gestion d'association n'était disponible qu'en français et jusque là n'avait pas beaucoup de portée. Mais on aimerait bien pouvoir proposer le logiciel dans d'autres langues dans les années à venir, et comme Garradin (le projet français) commence à être assez connu, il semble nécessaire de limiter les risques de confusion à l'avenir avec cette solution commerciale. + + Vous pouvez mettre à jour Garradin avec Paheko ! ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) From 3deeb62cd302de0a9464c392aa2c3940175c3e03 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 15 Jan 2023 00:12:32 +0000 Subject: [PATCH 4/6] Auto-update README --- README_fr.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README_fr.md b/README_fr.md index 7e2c66e..eaf4081 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,6 +23,8 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie Il est apparu que la prononciation de "Garradin" en français est parfois un peu compliquée, de même que son orthographe. Il existe déjà un logiciel commercial nommé "Garradin" en Australie, qui fait de la finance pour de grands groupes. Pour le moment cela ne posait pas de problème car notre solution de gestion d'association n'était disponible qu'en français et jusque là n'avait pas beaucoup de portée. Mais on aimerait bien pouvoir proposer le logiciel dans d'autres langues dans les années à venir, et comme Garradin (le projet français) commence à être assez connu, il semble nécessaire de limiter les risques de confusion à l'avenir avec cette solution commerciale. + + Vous pouvez mettre à jour Garradin avec Paheko ! ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) From c3b767cf043bc141e9c583a74ce6437c5f1a4501 Mon Sep 17 00:00:00 2001 From: Florent Date: Sun, 15 Jan 2023 10:31:40 +0100 Subject: [PATCH 5/6] Fix typo --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 6f24377..e8191fc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,7 +72,7 @@ fi [[ $YNH_APP_ID == "garradin" ]] \ && [[ "$(cat "/opt/$app/templates/.VERSION")" != 1.2.2 ]] \ - && ynh_die --message "It look like that you have an old Garradin install. You need first upgrade Gogs instance (id: $garradin_migrate_id) and after migrate to Paheko." + && ynh_die --message "It look like that you have an old Garradin install. You need first upgrade Garradin instance (id: $garradin_migrate_id) and after migrate to Paheko." ynh_handle_app_migration --migration_id=garradin --migration_list=garradin_migrations if [[ $migration_process -eq 1 ]]; then From fe8b429ccc30011605718bed4b905db9e830f7a1 Mon Sep 17 00:00:00 2001 From: Florent Date: Sun, 15 Jan 2023 10:56:13 +0100 Subject: [PATCH 6/6] Use --username argument for ynh_system_user_delete As per the documentation suggests: https://yunohost.org/fr/packaging_apps_helpers#ynh-system-user-delete --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index e8191fc..da5340f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -81,7 +81,7 @@ if [[ $migration_process -eq 1 ]]; then db_user=$app # Replace the user - ynh_system_user_delete $old_app + ynh_system_user_delete --username="$old_app" test getent passwd "$app" &>/dev/null || \ useradd -d "$datadir" --system --user-group "$app" --shell /bin/bash || \ ynh_die --message "Unable to create $app system account"