From 1e86b80eb83b44c1013e02e2a65a100d24682f51 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 19:34:55 +0200
Subject: [PATCH] add sudir (#68)

---
 manifest.toml   |  1 +
 scripts/install |  4 ++--
 scripts/upgrade | 10 ----------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 2f078ca..0caf3ef 100644
--- a/manifest.toml
+++ b/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 = "/"
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