From cde414d65e59fdfb5f77642b5208e4334a1a6a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 4 May 2023 21:52:55 +0200 Subject: [PATCH] Testing (#69) * #39 * Update upgrade * Update manifest.json * Auto-update README * Update _common.sh * Update _common.sh * Cleaning up * Fix * Create DESCRIPTION.md * Auto-update README * Create updater.sh * Update updater.sh * Create updater.yml (#42) * Update upgrade * Update upgrade * Auto-update README * Update upgrade * Update upgrade * Apply example_ynh (#43) * Auto-update README * Apply example_ynh * Auto-update README * fix missing datadir * Fix missing phpversion * Update upgrade * Update check_process Co-authored-by: yunohost-bot * Auto-update README * 4.7.0 (#50) * 4.6.2 * Auto-update README * 4.7.0 * Auto-update README * Fix PHP * Update upgrade * Update restore * Update install * Update install * Update PHP to 8.1 * Update upgrade * Update install * Fix * Update ffprobe.patch * Update install * Update install * Update upgrade Co-authored-by: yunohost-bot * Upgrade auto-updater (#58) * [autopatch] Upgrade auto-updater * Auto-update README --------- Co-authored-by: tituspijean * Update .env.example * Version 2 (#61) * v2 * fix * v2 * Update manifest.toml * Auto-update README * Fix * Auto-update README * 4.7.2 * Auto-update README * Update install * Update manifest.toml * Update _common.sh * Update install * Update install * Update .env.example * Update install * Update install * Update install * Update install * Update install * Update install * Update install * Update install * Fix * Update install * Update install * Update .env.example * Update install * Update install * Update install * Update manifest.toml * Auto-update README * remove config panel * Update manifest.toml * Auto-update README * Update upgrade * Update manifest.toml * Auto-update README * Delete app.src * Update manifest.toml * Update manifest.toml * Auto-update README * add sudir (#68) --------- Co-authored-by: yunohost-bot Co-authored-by: yalh76 Co-authored-by: YunoHost Bot Co-authored-by: tituspijean --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 9 +++++---- scripts/install | 4 ++-- scripts/upgrade | 10 ---------- 5 files changed, 9 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index ac2c921..064b79b 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Lychee is a free photo-management tool, which runs on your server or web-space. Installing is a matter of seconds. 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:** 4.7.2~ynh4 +**Shipped version:** 4.7.4~ynh1 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index 24325a7..40543da 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Lychee is a free photo-management tool, which runs on your server or web-space. Installing is a matter of seconds. Upload, manage and share photos like from a native application. Lychee comes with everything you need and all your photos are stored securely. -**Version incluse :** 4.7.2~ynh4 +**Version incluse :** 4.7.4~ynh1 **Démo :** https://lycheeorg.github.io/demo/ diff --git a/manifest.toml b/manifest.toml index fc6a130..0caf3ef 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ 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 = "4.7.2~ynh4" +version = "4.7.4~ynh1" maintainers = ["eric_G"] @@ -17,7 +17,7 @@ admindoc = "https://lycheeorg.github.io/docs/" code = "https://github.com/LycheeOrg/Lychee" [integration] -yunohost = ">= 11.1.15" +yunohost = ">= 11.1.18" architectures = "all" multi_instance = true ldap = false @@ -45,14 +45,15 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/LycheeOrg/Lychee/releases/download/v4.7.2/Lychee.zip" - sha256 = "6353db3f2b0963f4a94576c2b16ed7eb7bb2954cd0b0dd745ba4db47998e8df0" + url = "https://github.com/LycheeOrg/Lychee/releases/download/v4.7.4/Lychee.zip" + sha256 = "e36e4864760c9dd401cd2bba56e4a989e09bdc0352a7d1f56c8cd3a5b0a7f7f5" [resources.system_user] [resources.install_dir] [resources.data_dir] + subdirs = ["uploads/big", "uploads/import", "uploads/medium", "uploads/raw", "uploads/small", "uploads/thumb"] [resources.permissions] main.url = "/" diff --git a/scripts/install b/scripts/install index aea2ea2..cc26796 100755 --- a/scripts/install +++ b/scripts/install @@ -63,8 +63,8 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Creating a data directory..." --weight=1 -mkdir -p $data_dir/uploads -mkdir -p $data_dir/uploads/{big,import,medium,raw,small,thumb} +#mkdir -p $data_dir/uploads +#mkdir -p $data_dir/uploads/{big,import,medium,raw,small,thumb} 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/ diff --git a/scripts/upgrade b/scripts/upgrade index aedb550..9749585 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,16 +22,6 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -# If new "/home/yunohost.app/$app" doesn't exist, create it -if [ -z "/home/yunohost.app/$app" ]; then - data_dir=/home/yunohost.app/$app - mkdir -p $data_dir - chmod 755 $data_dir - chown -R $app:www-data $data_dir -#REMOVEME? ynh_app_setting_set --app=$app --key=data_dir --value=$data_dir - cp -a "$install_dir/public/uploads" "$data_dir/uploads" -fi - # If fpm_footprint doesn't exist, create it if [ -z "${fpm_footprint:-}" ]; then fpm_footprint=low