From 680fe303b3c22510cf92430d58d755ac8269d2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 Mar 2023 22:12:03 +0100 Subject: [PATCH] Testing (#66) * #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 --------- 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 +- conf/app.src | 7 ------- manifest.toml | 11 +++++++++-- scripts/upgrade | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 conf/app.src diff --git a/README.md b/README.md index 5919b0e..ac2c921 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~ynh3 +**Shipped version:** 4.7.2~ynh4 **Demo:** https://lycheeorg.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index e4b8d74..24325a7 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~ynh3 +**Version incluse :** 4.7.2~ynh4 **Démo :** https://lycheeorg.github.io/demo/ diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index 85bc8ab..0000000 --- a/conf/app.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://github.com/LycheeOrg/Lychee/releases/download/v4.7.2/Lychee.zip -SOURCE_SUM=6353db3f2b0963f4a94576c2b16ed7eb7bb2954cd0b0dd745ba4db47998e8df0 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true diff --git a/manifest.toml b/manifest.toml index 513760f..fc6a130 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~ynh3" +version = "4.7.2~ynh4" maintainers = ["eric_G"] @@ -17,7 +17,7 @@ admindoc = "https://lycheeorg.github.io/docs/" code = "https://github.com/LycheeOrg/Lychee" [integration] -yunohost = ">= 11.1.13" +yunohost = ">= 11.1.15" architectures = "all" multi_instance = true ldap = false @@ -41,6 +41,13 @@ ram.runtime = "50M" default = "visitors" [resources] + + [resources.sources] + + [resources.sources.main] + url = "https://github.com/LycheeOrg/Lychee/releases/download/v4.7.2/Lychee.zip" + sha256 = "6353db3f2b0963f4a94576c2b16ed7eb7bb2954cd0b0dd745ba4db47998e8df0" + [resources.system_user] [resources.install_dir] diff --git a/scripts/upgrade b/scripts/upgrade index 336ad77..aedb550 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,19 +33,19 @@ if [ -z "/home/yunohost.app/$app" ]; then fi # If fpm_footprint doesn't exist, create it -if [ -z "$fpm_footprint" ]; then +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 +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 +if [ -z "${fpm_usage:-}" ]; then fpm_usage=low ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi