Merge branch 'testing' of https://github.com/YunoHost-Apps/lychee_ynh into testing

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/
 

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/
 

manifest.toml

@@ -53,6 +53,7 @@ ram.runtime = "50M"
     [resources.install_dir]
 
     [resources.data_dir]
+    subdirs = ["uploads/big", "uploads/import", "uploads/medium", "uploads/raw", "uploads/small", "uploads/thumb"]
 
     [resources.permissions]
     main.url = "/"

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/

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