From 3421405ca632fe441009e407499da6bad97d8853 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sat, 20 Apr 2024 19:40:28 +0200 Subject: [PATCH] Testing v5.1.2~ynh2 (#106) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Upgrade to v5.1.2 (#102) * Upgrade to v5.1.2 * Auto-update README * Update install * Update manifest.toml * Auto-update README * trying to fix upgrade (#105) * trying to fix upgrade * forgotten =1 * Update tests.toml --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> * cleaning (#104) * cleaning * Update upgrade * break lines * SC2154 fixes * Auto-update README * fix paths * typo --------- Co-authored-by: OniriCorpe Co-authored-by: yunohost-bot * remove maintenance * Auto-update READMEs * Upgrade to v5.2.1 (#108) * Upgrade to v5.2.1 * Auto-update READMEs --------- Co-authored-by: eric_G <46165813+ericgaspar@users.noreply.github.com> --------- Co-authored-by: YunoHost Bot Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot --- ALL_README.md | 3 ++- README.md | 9 ++++--- README_eu.md | 52 ++++++++++++++++++++++++++++++++++++ README_fr.md | 6 +++-- README_gl.md | 7 +++-- README_zh_Hans.md | 52 ++++++++++++++++++++++++++++++++++++ conf/ffprobe.patch | 13 --------- conf/user.css.example | 23 ---------------- doc/DESCRIPTION.md | 4 ++- doc/DESCRIPTION_fr.md | 4 ++- manifest.toml | 8 +++--- scripts/config | 12 ++++----- scripts/install | 50 ++++++++++++++-------------------- scripts/restore | 12 ++++----- scripts/upgrade | 62 +++++++++++++------------------------------ tests.toml | 8 +++--- 16 files changed, 187 insertions(+), 138 deletions(-) create mode 100644 README_eu.md create mode 100644 README_zh_Hans.md delete mode 100644 conf/ffprobe.patch delete mode 100644 conf/user.css.example diff --git a/ALL_README.md b/ALL_README.md index 3d6c579..a01b345 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,7 @@ # 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) - [Le o README en galego](README_gl.md) -- [Leggi il “README” in italiano](README_it.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index ce6e0d1..46eceb6 100644 --- a/README.md +++ b/README.md @@ -9,16 +9,19 @@ It shall NOT be edited by hand. [![Install Lychee with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lychee) -*[Read this README is other languages.](./ALL_README.md)* +*[Read this README in other languages.](./ALL_README.md)* > *This package allows you to install Lychee 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 -Lychee is a free photo-management tool, which runs on your server or web-space. Upload, manage and share photos like from a native application. Lychee comes with everything you need and all your photos are stored securely. +Lychee is a free photo-management tool, which runs on your server or web-space. +Upload, manage and share photos like from a native application. +Lychee comes with everything you need and all your photos are stored securely. -**Shipped version:** 5.1.2~ynh1 + +**Shipped version:** 5.2.1~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..e754973 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,52 @@ + + +# Lychee YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/lychee.svg)](https://dash.yunohost.org/appci/app/lychee) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/lychee.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/lychee.maintain.svg) + +[![Instalatu Lychee YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lychee) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Lychee YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Lychee is a free photo-management tool, which runs on your server or web-space. +Upload, manage and share photos like from a native application. +Lychee comes with everything you need and all your photos are stored securely. + + +**Paketatutako bertsioa:** 5.2.1~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![Lychee(r)en pantaila-argazkia](./doc/screenshots/screenshot.jpg) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/lychee_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/lychee_ynh/tree/testing --debug +edo +sudo yunohost app upgrade lychee -u https://github.com/YunoHost-Apps/lychee_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 52322bc..e6c95da 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,10 +16,12 @@ Il NE doit PAS être modifié à la main. ## Vue d’ensemble -Lychee est un outil de gestion de photos, qui s'exécute sur votre serveur ou espace Web. Téléchargez, gérez et partagez des photos comme à partir d'une application native. Lychee est livré avec tout ce dont vous avez besoin et toutes vos photos sont stockées en toute sécurité. +Lychee est un outil de gestion de photos, qui s'exécute sur votre serveur ou espace Web. +Téléchargez, gérez et partagez des photos comme à partir d'une application native. +Lychee est livré avec tout ce dont vous avez besoin et toutes vos photos sont stockées en toute sécurité. -**Version incluse :** 5.1.2~ynh1 +**Version incluse :** 5.2.1~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 0feb045..ad7635e 100644 --- a/README_gl.md +++ b/README_gl.md @@ -16,9 +16,12 @@ NON debe editarse manualmente. ## Vista xeral -Lychee is a free photo-management tool, which runs on your server or web-space. Upload, manage and share photos like from a native application. Lychee comes with everything you need and all your photos are stored securely. +Lychee is a free photo-management tool, which runs on your server or web-space. +Upload, manage and share photos like from a native application. +Lychee comes with everything you need and all your photos are stored securely. -**Versión proporcionada:** 5.1.2~ynh1 + +**Versión proporcionada:** 5.2.1~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..09c5a5d --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,52 @@ + + +# YunoHost 的 Lychee + +[![集成程度](https://dash.yunohost.org/integration/lychee.svg)](https://dash.yunohost.org/appci/app/lychee) ![工作状态](https://ci-apps.yunohost.org/ci/badges/lychee.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/lychee.maintain.svg) + +[![使用 YunoHost 安装 Lychee](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lychee) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Lychee。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +Lychee is a free photo-management tool, which runs on your server or web-space. +Upload, manage and share photos like from a native application. +Lychee comes with everything you need and all your photos are stored securely. + + +**分发版本：** 5.2.1~ynh1 + +**演示：** + +## 截图 + +![Lychee 的截图](./doc/screenshots/screenshot.jpg) + +## 文档与资源 + +- 官方应用网站： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/lychee_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/lychee_ynh/tree/testing --debug +或 +sudo yunohost app upgrade lychee -u https://github.com/YunoHost-Apps/lychee_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** diff --git a/conf/ffprobe.patch b/conf/ffprobe.patch deleted file mode 100644 index 37cd969..0000000 --- a/conf/ffprobe.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php b/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php -index 9ececfe..106eadd 100644 ---- a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php -+++ b/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php -@@ -40,7 +40,7 @@ class FFprobe extends AdapterAbstract - * - * @var string - */ -- protected string $toolPath = ''; -+ protected string $toolPath = '/usr/bin/ffprobe'; - - /** - * @var string-e diff --git a/conf/user.css.example b/conf/user.css.example deleted file mode 100644 index b6ed836..0000000 --- a/conf/user.css.example +++ /dev/null @@ -1,23 +0,0 @@ -/* Disable the 'zoom' animation while browsing pictures */ -#imageview #image { - transition: none !important; - animation-name: none !important; - animation-duration: 0 !important; -} - -/* Hide smart albums */ -/* -[data-id="0"] { display:none; } -[data-id="s"] { display:none; } -[data-id="f"] { display:none; } -[data-id="r"] { display:none; } -*/ - -/* Make the diadnostic font bigger */ -.settings_view p, .settings_view a, .settings_view input, -.sharing_view p, .sharing_view a, .sharing_view input, .sharing_view option, -.users_view p, .users_view a, .users_view input, .users_view option, -.logs_diagnostics_view pre { - font-size: 12pt; - line-height: 14pt; -} diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index b9a1229..4da3390 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1,3 @@ -Lychee is a free photo-management tool, which runs on your server or web-space. Upload, manage and share photos like from a native application. Lychee comes with everything you need and all your photos are stored securely. \ No newline at end of file +Lychee is a free photo-management tool, which runs on your server or web-space. +Upload, manage and share photos like from a native application. +Lychee comes with everything you need and all your photos are stored securely. diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 9eec097..77f7c7f 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1 +1,3 @@ -Lychee est un outil de gestion de photos, qui s'exécute sur votre serveur ou espace Web. Téléchargez, gérez et partagez des photos comme à partir d'une application native. Lychee est livré avec tout ce dont vous avez besoin et toutes vos photos sont stockées en toute sécurité. +Lychee est un outil de gestion de photos, qui s'exécute sur votre serveur ou espace Web. +Téléchargez, gérez et partagez des photos comme à partir d'une application native. +Lychee est livré avec tout ce dont vous avez besoin et toutes vos photos sont stockées en toute sécurité. diff --git a/manifest.toml b/manifest.toml index 162f00e..f4ac480 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,9 +5,9 @@ name = "Lychee" description.en = "Photo-management-system to manage and share photos" description.fr = "Système de gestion de photos pour gérer et partager des photos" -version = "5.1.2~ynh1" +version = "5.2.1~ynh1" -maintainers = ["eric_G"] +maintainers = [""] [upstream] license = "MIT" @@ -46,8 +46,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v5.1.2.tar.gz" - sha256 = "9f5fa367e68b8a0027978082634625dbd210eefd95474fc95b11dcc506eab541" + url = "https://github.com/LycheeOrg/Lychee/archive/refs/tags/v5.2.1.tar.gz" + sha256 = "1f2773aef9bcdf38662a8cd0baa9027601ae5c7f31f78426e8dcc1e042950b6e" autoupdate.strategy = "latest_github_tag" [resources.system_user] diff --git a/scripts/config b/scripts/config index 91c2de7..06f34e2 100644 --- a/scripts/config +++ b/scripts/config @@ -15,8 +15,8 @@ ynh_abort_if_errors # RETRIEVE ARGUMENTS #================================================= -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) +phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) +current_fpm_footprint=$(ynh_app_setting_get --app="$app" --key=fpm_footprint) #================================================= # SPECIFIC GETTERS FOR TOML SHORT KEY @@ -52,14 +52,14 @@ get__free_footprint() { set__fpm_footprint() { if [ "$fpm_footprint" != "specific" ] then - ynh_app_setting_set --app=$app --key=fpm_footprint --value="$fpm_footprint" + ynh_app_setting_set --app="$app" --key=fpm_footprint --value="$fpm_footprint" fi } set__fpm_free_footprint() { if [ "$fpm_footprint" = "specific" ] then - ynh_app_setting_set --app=$app --key=fpm_footprint --value="$fpm_free_footprint" + ynh_app_setting_set --app="$app" --key=fpm_footprint --value="$fpm_free_footprint" fi } @@ -89,7 +89,7 @@ ynh_app_config_validate() { ynh_app_config_apply() { _ynh_app_config_apply - ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint + ynh_add_fpm_config --phpversion="$phpversion" --usage="$fpm_usage" --footprint="$fpm_footprint" } -ynh_app_config_run $1 +ynh_app_config_run "$1" diff --git a/scripts/install b/scripts/install index cb20b54..e62f9ab 100755 --- a/scripts/install +++ b/scripts/install @@ -13,10 +13,6 @@ source /usr/share/yunohost/helpers # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -fpm_footprint="low" -fpm_free_footprint=0 -fpm_usage="low" - timezone="$(cat /etc/timezone)" #================================================= @@ -25,15 +21,7 @@ timezone="$(cat /etc/timezone)" ynh_script_progression --message="Installing dependencies..." --weight=7 # Install Nodejs -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= - -ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage +ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -45,9 +33,9 @@ ynh_setup_source --dest_dir="$install_dir" chmod 750 "$install_dir/bootstrap/cache" chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" -chown -R $app: "$install_dir/public/sym/" -chmod -R 755 $data_dir +chown -R "$app:www-data" "$install_dir" +chown -R "$app:" "$install_dir/public/sym/" +chmod -R 755 "$data_dir" #================================================= # PHP-FPM CONFIGURATION @@ -55,7 +43,7 @@ chmod -R 755 $data_dir ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config @@ -67,8 +55,8 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Creating a data directory..." --weight=1 -chgrp $app -R $install_dir/storage $install_dir/public/dist $install_dir/public/sym $data_dir/uploads -chmod -R 2775 $install_dir/storage/* $install_dir/app/* $install_dir/public/dist $install_dir/public/sym $data_dir/uploads $install_dir/bootstrap/ +chgrp "$app" -R "$install_dir/storage" "$install_dir/public/dist" "$install_dir/public/sym" "$data_dir/uploads" +chmod -R 2775 "$install_dir/storage" "$install_dir/app" "$install_dir/public/dist" "$install_dir/public/sym" "$data_dir/uploads" "$install_dir/bootstrap/" #================================================= # INSTALL APP WITH COMPOSER @@ -82,10 +70,10 @@ ynh_install_composer #================================================= ynh_script_progression --message="Installing $app..." --weight=10 -pushd $install_dir +pushd "$install_dir" ynh_use_nodejs - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH NODE_ENV=production $ynh_npm run build + ynh_exec_warn_less sudo -u "$app" env "$ynh_node_load_PATH" "$ynh_npm" install + ynh_exec_warn_less sudo -u "$app" env "$ynh_node_load_PATH" NODE_ENV=production "$ynh_npm" run build popd #================================================= @@ -96,22 +84,24 @@ ynh_script_progression --message="Adding a configuration file..." ynh_add_config --template=".env.example" --destination="$install_dir/.env" chmod 400 "$install_dir/.env" -chown $app:$app "$install_dir/.env" +chown "$app:$app" "$install_dir/.env" #================================================= # BUILDING #================================================= ynh_script_progression --message="Building..." --weight=10 -pushd $install_dir - php$phpversion artisan key:generate -n --force --env - php$phpversion artisan migrate -n --force - php$phpversion artisan config:clear -n - php$phpversion artisan config:cache -n +pushd "$install_dir" + "php$phpversion" artisan key:generate -n --force --env + "php$phpversion" artisan migrate -n --force + "php$phpversion" artisan config:clear -n + "php$phpversion" artisan config:cache -n popd -# Setup custom user.css file -ynh_add_config --template="user.css.example" --destination="$install_dir/public/dist/user.css" +chmod 750 "$install_dir" +chmod 750 "$install_dir/bootstrap/cache" +chmod -R o-rwx "$install_dir" +chown -R "$app:www-data" "$install_dir" #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index 6f464d2..d96cfa4 100755 --- a/scripts/restore +++ b/scripts/restore @@ -19,7 +19,7 @@ ynh_restore_file --origin_path="$install_dir" chmod 750 "$install_dir/bootstrap/cache" chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +chown -R "$app:www-data" "$install_dir" #================================================= # RESTORE THE DATA DIRECTORY @@ -28,7 +28,7 @@ ynh_script_progression --message="Restoring the data directory..." ynh_restore_file --origin_path="$data_dir" --not_mandatory -chown -R $app:www-data "$data_dir" +chown -R "$app:www-data" "$data_dir" #================================================= # REINSTALL DEPENDENCIES @@ -36,7 +36,7 @@ chown -R $app:www-data "$data_dir" ynh_script_progression --message="Reinstalling dependencies..." --weight=7 # Install Nodejs -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version +ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version" #================================================= # RESTORE THE PHP-FPM CONFIGURATION @@ -46,11 +46,11 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # Recreate a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion +ynh_add_fpm_config ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql +ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < ./db.sql #================================================= # GENERIC FINALIZATION @@ -59,7 +59,7 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ #================================================= ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." -ynh_systemd_action --service_name=php$phpversion-fpm --action=reload +ynh_systemd_action --service_name="php$phpversion-fpm" --action=reload ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index e5bad4e..3a59c6d 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,37 +9,14 @@ source _common.sh source /usr/share/yunohost/helpers +timezone="$(cat /etc/timezone)" + #================================================= # CHECK VERSION #================================================= upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# STANDARD UPGRADE STEPS -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# If fpm_footprint doesn't exist, create it -if [ -z "${fpm_footprint:-}" ]; then - fpm_footprint=low - ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -fi - -# If fpm_free_footprint doesn't exist, create it -if [ -z "${fpm_free_footprint:-}" ]; then - fpm_free_footprint=0 - ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -fi - -# If fpm_usage doesn't exist, create it -if [ -z "${fpm_usage:-}" ]; then - fpm_usage=low - ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -49,13 +26,12 @@ then ynh_script_progression --message="Upgrading source files..." --weight=4 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep=".env public/dist/user.css" + ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env" fi chmod 750 "$install_dir/bootstrap/cache" chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" -chmod -R 755 $data_dir +chown -R "$app:www-data" "$install_dir" #================================================= # UPGRADE DEPENDENCIES @@ -63,7 +39,7 @@ chmod -R 755 $data_dir ynh_script_progression --message="Upgrading dependencies..." --weight=5 # Install Nodejs -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version +ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version" #================================================= # PHP-FPM CONFIGURATION @@ -71,7 +47,7 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config @@ -81,12 +57,12 @@ ynh_add_nginx_config #================================================= # UPDATE A CONFIG FILE #================================================= -#ynh_script_progression --message="Updating a configuration file..." +ynh_script_progression --message="Updating a configuration file..." -#ynh_add_config --template=".env.example" --destination="$install_dir/.env" +ynh_add_config --template=".env.example" --destination="$install_dir/.env" -#chmod 400 "$install_dir/.env" -#chown $app:$app "$install_dir/.env" +chmod 400 "$install_dir/.env" +chown "$app:$app" "$install_dir/.env" #================================================= # INSTALL APP WITH COMPOSER @@ -100,10 +76,10 @@ ynh_install_composer #================================================= ynh_script_progression --message="Installing $app..." --weight=10 -pushd $install_dir +pushd "$install_dir" ynh_use_nodejs - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH NODE_ENV=production $ynh_npm run build + ynh_exec_warn_less sudo -u "$app" env "$ynh_node_load_PATH" "$ynh_npm" install + ynh_exec_warn_less sudo -u "$app" env "$ynh_node_load_PATH" NODE_ENV=production "$ynh_npm" run build popd #================================================= @@ -113,17 +89,17 @@ ynh_script_progression --message="Building..." --weight=4 ynh_exec_warn_less ynh_composer_exec --commands="dump-autoload" -pushd $install_dir - php$phpversion artisan migrate -n --force - php$phpversion artisan config:clear -n - php$phpversion artisan config:cache -n - php$phpversion artisan view:clear +pushd "$install_dir" + "php$phpversion" artisan migrate -n --force + "php$phpversion" artisan config:clear -n + "php$phpversion" artisan config:cache -n + "php$phpversion" artisan view:clear popd chmod 750 "$install_dir" chmod 750 "$install_dir/bootstrap/cache" chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +chown -R "$app:www-data" "$install_dir" #================================================= # END OF SCRIPT diff --git a/tests.toml b/tests.toml index 91daf17..83e7358 100644 --- a/tests.toml +++ b/tests.toml @@ -2,6 +2,8 @@ test_format = 1.0 [default] - # ------------ - # Tests to run - # ------------ \ No newline at end of file + # ------------------------------- + # Commits to test upgrade from + # ------------------------------- + + test_upgrade_from.fc44c0a853aeaebb4854a3271a4d0c86a3d61bfc.name = "Upgrade from 5.1.2" \ No newline at end of file