From 7e84df8c017cd6d934b2175402d85670fb1d2e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 27 Oct 2022 23:49:43 +0200 Subject: [PATCH 1/4] 8.0.0 --- conf/app.src | 4 ++-- manifest.json | 4 ++-- scripts/install | 2 +- scripts/upgrade | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/app.src b/conf/app.src index 12dbbb5..613949b 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/PrestaShop/PrestaShop/releases/download/1.7.8.6/prestashop_1.7.8.6.zip -SOURCE_SUM=3d84c258990cbbe76eda57829e847c5023930925223f49b578739244c660db06 +SOURCE_URL=https://github.com/PrestaShop/PrestaShop/releases/download/8.0.0/prestashop_8.0.0.zip +SOURCE_SUM=8d3105ae0a8779873a409edb74581c0a261b8e193c0d9e5e5ed719da90021067 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index dd81db0..f289a55 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Create a E-commerce Website", "fr": "Créer un site ecommerce" }, - "version": "1.7.8.6~ynh1", + "version": "8.0.0~ynh1", "url": "https://www.prestashop.com/", "upstream": { "license": "OSL-3.0", @@ -28,7 +28,7 @@ } ], "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index 84320ab..e1a5bdc 100644 --- a/scripts/install +++ b/scripts/install @@ -24,7 +24,6 @@ domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC admin=$YNH_APP_ARG_ADMIN -phpversion=$YNH_PHP_VERSION app=$YNH_APP_INSTANCE_NAME @@ -100,6 +99,7 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=3 # Create a dedicated PHP-FPM config ynh_add_fpm_config +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # SETUP SSOWAT diff --git a/scripts/upgrade b/scripts/upgrade index 9e6a52e..7d3ef38 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,7 +21,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -phpversion=$YNH_PHP_VERSION +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # CHECK VERSION From a9f1cbf1dc9b50f429c40c626d41978ffa888e20 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 27 Oct 2022 21:49:48 +0000 Subject: [PATCH 2/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 f68fd63..42a0c62 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in PrestaShop is an Open Source e-commerce web application, committed to providing the best shopping cart experience for both merchants and customers. It is written in PHP, is highly customizable, supports all the major payment services, is translated in many languages and localized for many countries, has a fully responsive design (both front and back office), etc. -**Shipped version:** 1.7.8.6~ynh1 - +**Shipped version:** 8.0.0~ynh1 **Demo:** https://demo.prestashop.com/#/en/front diff --git a/README_fr.md b/README_fr.md index 4e90b11..1e74b61 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,8 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour PrestaShop is an Open Source e-commerce web application, committed to providing the best shopping cart experience for both merchants and customers. It is written in PHP, is highly customizable, supports all the major payment services, is translated in many languages and localized for many countries, has a fully responsive design (both front and back office), etc. -**Version incluse :** 1.7.8.6~ynh1 - +**Version incluse :** 8.0.0~ynh1 **Démo :** https://demo.prestashop.com/#/en/front From 9cd3e86df69d06ab8af7180d9aeb8fe7da57d938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 28 Oct 2022 00:05:26 +0200 Subject: [PATCH 3/4] Update check_process --- check_process | 1 + 1 file changed, 1 insertion(+) diff --git a/check_process b/check_process index a94739b..2cebb04 100644 --- a/check_process +++ b/check_process @@ -3,6 +3,7 @@ domain="domain.tld" path="/path" is_public=1 + admin="john" ; Checks pkg_linter=1 setup_sub_dir=1 From 21dad8b95c5c880febd0921f304b4c35093bc341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 28 Oct 2022 00:06:07 +0200 Subject: [PATCH 4/4] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 4e9615d..2d75c4c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/ ; + alias __FINALPATH__/; index index.php;