From e3d1f2de7f5fbd774c64105c54da03063e8d185f Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 18 Dec 2022 21:48:01 +0100 Subject: [PATCH 1/7] Select composer version during install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 2d98ec8d..cf94b71f 100644 --- a/scripts/install +++ b/scripts/install @@ -125,7 +125,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Installing composer dependencies..." --weight=1 -ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" +ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --composerversion="$YNH_COMPOSER_VERSION" --workdir="$final_path" #================================================= # CREATE LOG FILE From c874daa1124e79badb6b2a25ec08ab30bebf0af7 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 18 Dec 2022 21:52:10 +0100 Subject: [PATCH 2/7] Upgrade composer to v2 --- scripts/upgrade | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index b831e1d2..f6e95d06 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -183,6 +183,10 @@ ynh_add_nginx_config #================================================= # UPDATE COMPOSER DEPENDENCIES #================================================= +ynh_script_progression --message="Updating composer..." --weight=1 + +ynh_exec_warn_less ynh_composer_exec --workdir="$final_path" --commands="self-update --2" + ynh_script_progression --message="Updating composer dependencies..." --weight=1 ynh_exec_warn_less ynh_composer_exec --workdir="$final_path" --commands="update" From bd4f58a962da4edf0adb9da148e9b6eaafd88ca9 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 18 Dec 2022 22:12:05 +0100 Subject: [PATCH 3/7] fix composer upgrade syntax --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index f6e95d06..862c6df5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -185,7 +185,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Updating composer..." --weight=1 -ynh_exec_warn_less ynh_composer_exec --workdir="$final_path" --commands="self-update --2" +ynh_exec_warn_less ynh_composer_exec --workdir="$final_path" --commands="self-update" ynh_script_progression --message="Updating composer dependencies..." --weight=1 From 04af47158118d8d25c1a1a1f32188c9d1de29f4a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 21 Dec 2022 14:37:23 +0100 Subject: [PATCH 4/7] upgrade to PHP8 --- doc/DISCLAIMER.md | 2 +- doc/DISCLAIMER_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 39be44ec..20ec496a 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -8,7 +8,7 @@ After being first registered, you need to execute the folloing command to promot **Run:** - $ sudo php7.4 /var/www/pixelfed/artisan user:admin 1 + $ sudo php8.0 /var/www/pixelfed/artisan user:admin 1 and respond yes to the question ` Add admin privileges to this user?`. diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index c9435ae6..05427d14 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -8,7 +8,7 @@ Après avoir été enregistré pour la première fois, vous devez exécuter la c **Entrez la commande:** - $ php7.4 /var/www/pixelfed/artisan user:admin 1 + $ php8.0 /var/www/pixelfed/artisan user:admin 1 et répondez oui à la question « Ajouter des privilèges d'administrateur à cet utilisateur ? » From 8828df74ec0e944aa651c9ad4107c581088281ea Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 21 Dec 2022 13:37:28 +0000 Subject: [PATCH 5/7] 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 73417a61..3349a051 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ After being first registered, you need to execute the folloing command to promot **Run:** - $ sudo php7.4 /var/www/pixelfed/artisan user:admin 1 + $ sudo php8.0 /var/www/pixelfed/artisan user:admin 1 and respond yes to the question ` Add admin privileges to this user?`. diff --git a/README_fr.md b/README_fr.md index ccb3d76f..6b6e8513 100644 --- a/README_fr.md +++ b/README_fr.md @@ -43,7 +43,7 @@ Après avoir été enregistré pour la première fois, vous devez exécuter la c **Entrez la commande:** - $ php7.4 /var/www/pixelfed/artisan user:admin 1 + $ php8.0 /var/www/pixelfed/artisan user:admin 1 et répondez oui à la question « Ajouter des privilèges d'administrateur à cet utilisateur ? » From 03a0b09f536f15fe1c069b97f3f8923ef3148793 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 21 Dec 2022 14:38:46 +0100 Subject: [PATCH 6/7] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index ce84ce25..68c7cafc 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "ActivityPub Federated Image Sharing", "fr": "Logiciel de partage d'image fédéré via ActivityPub" }, - "version": "0.11.4~ynh3", + "version": "0.11.4~ynh4", "url": "https://pixelfed.org/", "upstream": { "license": "AGPL-3.0-or-later", From b88ab489da9f8eeb0e88a3827d3feef3f6ce1555 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 21 Dec 2022 13:38:58 +0000 Subject: [PATCH 7/7] 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 3349a051..3b36507a 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.4~ynh3 +**Shipped version:** 0.11.4~ynh4 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 6b6e8513..db1f684f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.4~ynh3 +**Version incluse :** 0.11.4~ynh4 ## Captures d'écran