From b0c31f30f6e145a7b2cbe8e04f0875f3ec22075c Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 18:54:05 +0200 Subject: [PATCH 1/8] Update upgrade need keep this file --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 2e9d63c..ecb1f5f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -76,6 +76,7 @@ if ynh_compare_current_package_version --comparison ge --version 1.3.0~ynh1; the fi # NOTE: Don't overwrite config.local.user.php ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" +ynh_add_config --template="config.user.local.php" --destination="$install_dir/config.local.php" # Permissions on files and directories chmod -R o-rwx "$install_dir" From d080f445e52d541da6002e94d76661adebe98b71 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 19:23:49 +0200 Subject: [PATCH 2/8] Update upgrade fix update --- scripts/upgrade | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index ecb1f5f..10950a4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,9 +71,7 @@ if ynh_compare_current_package_version --comparison lt --version 1.1.15~ynh1; th chmod 750 "$install_dir/config.local.user.php" ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" fi -if ynh_compare_current_package_version --comparison ge --version 1.3.0~ynh1; then - ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" -fi + # NOTE: Don't overwrite config.local.user.php ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" ynh_add_config --template="config.user.local.php" --destination="$install_dir/config.local.php" From 5d9c822f67fc029b91017f4b0231d5217c0fd9eb Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 19:24:45 +0200 Subject: [PATCH 3/8] Update manifest.toml fix update --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index a41f0ed..32f4396 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.2.11~ynh2" +version = "1.2.11~ynh3" maintainers = ["rodinux"] From 4b496fd510d90638aa2e4202ae715505268b460b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 12 Sep 2023 17:24:49 +0000 Subject: [PATCH 4/8] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6e81c17..4c6b308 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Paheko (we chose the name Paheko, a word from the Māori language meaning "to co It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. -**Shipped version:** 1.2.11~ynh2 +**Shipped version:** 1.2.11~ynh3 **Demo:** https://paheko.cloud/essai/ diff --git a/README_fr.md b/README_fr.md index 0413e11..f5c11f9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.2.11~ynh2 +**Version incluse :** 1.2.11~ynh3 **Démo :** https://paheko.cloud/essai/ From 0a338c35fdf1bde6bffba35a3841cf64e0fef48d Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 19:27:57 +0200 Subject: [PATCH 5/8] Update upgrade correct name template --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 10950a4..15f320d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -74,7 +74,7 @@ fi # NOTE: Don't overwrite config.local.user.php ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" -ynh_add_config --template="config.user.local.php" --destination="$install_dir/config.local.php" +ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.php" # Permissions on files and directories chmod -R o-rwx "$install_dir" From 391e3fbb6df748efb9383d7c31fa789c5090f136 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 19:55:10 +0200 Subject: [PATCH 6/8] Update upgrade add good template --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 15f320d..f48915c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -74,7 +74,7 @@ fi # NOTE: Don't overwrite config.local.user.php ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" -ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.php" +ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.yunohost.php" # Permissions on files and directories chmod -R o-rwx "$install_dir" From 3c548ed22175a9a9b9c67df3976c8f6ee3fe96b0 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 20:18:18 +0200 Subject: [PATCH 7/8] Update upgrade try a --full_replace=1 --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index f48915c..8293fd8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,7 +38,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite squelettes/ data/ skel-dist/ config.local.user.php" + ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite squelettes data skel-dist config.local.user.php" --full_replace=1 fi chmod -R o-rwx "$install_dir" From 2aaa7c9320599384c603d45d1b23be451052adb3 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 22:17:21 +0200 Subject: [PATCH 8/8] Update upgrade syntax error --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 8293fd8..fefd537 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -74,7 +74,7 @@ fi # NOTE: Don't overwrite config.local.user.php ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" -ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.yunohost.php" +ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" # Permissions on files and directories chmod -R o-rwx "$install_dir"