From 10b6ea211cdb55c12f2a0258ed90da9bddf38099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 4 Jun 2021 11:25:56 +0200
Subject: [PATCH] 3.10.4 (#42)

* 3.10.4
---
 README.md       | 2 +-
 README_fr.md    | 2 +-
 conf/app.src    | 4 ++--
 manifest.json   | 2 +-
 scripts/install | 4 ++--
 scripts/restore | 2 +-
 scripts/upgrade | 8 --------
 7 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 3dbb79d..778d024 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/inst
 ## Overview
 [Moodle](https://moodle.org) is a learning platform designed to provide educators, administrators and learners with a single robust, secure and integrated system to create personalised learning environments. Moodle is widely used around the world by universities, schools, companies and all manner of organisations and individuals.
 
-**Shipped version:** 3.10.3
+**Shipped version:** 3.10.4
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 9f3643b..5d8f724 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/install)
 ## Vue d'ensemble
 [Moodle](https://moodle.org) est une plateforme d'apprentissage conçue pour fournir aux enseignants, aux administrateurs et aux apprenants un système unique robuste, sécurisé et intégré pour créer des environnements d'apprentissage personnalisés. Moodle est largement utilisé dans le monde entier par les universités, les écoles, les entreprises et toutes sortes d'organisations et d'individus. 
 
-**Version incluse :** 3.10.3
+**Version incluse :** 3.10.4
 
 ## Captures d'écran
 
diff --git a/conf/app.src b/conf/app.src
index 621f625..d917c00 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/moodle/moodle/archive/v3.10.3.zip
-SOURCE_SUM=f92e603a261d013b1c6f2956d1511b7e5d65ac1e9f05de77a94183bc3faaba7d
+SOURCE_URL=https://github.com/moodle/moodle/archive/v3.10.4.zip
+SOURCE_SUM=00b6020496e4a7d7d107bbb398d56425c2ba57188bf16756f0480ac973229c33
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index f668490..c3ac22f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Online learning platform",
         "fr": "Plateforme d'apprentissage en ligne"
     },
-    "version": "3.10.3~ynh1",
+    "version": "3.10.4~ynh1",
     "url": "https://moodle.org/",
     "license": "GPL-3.0-or-later",
     "maintainer": {
diff --git a/scripts/install b/scripts/install
index 6f05f87..9cc7165 100644
--- a/scripts/install
+++ b/scripts/install
@@ -50,6 +50,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=admin --value=$admin
+ynh_app_setting_set --app=$app --key=data_path --value=$data_path
 
 #=================================================
 # STANDARD MODIFICATIONS
@@ -114,10 +115,9 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 # SECURE FILES AND DIRECTORIES
 #=================================================
 
-ynh_app_setting_set --app=$app --key=data_path --value=$data_path
+chown -R $app: "$final_path"
 mkdir -p $data_path
 chown -R $app: $data_path
-chown -R $app: $final_path
 
 #=================================================
 # SETUP APPLICATION
diff --git a/scripts/restore b/scripts/restore
index 1ca08a6..51c7010 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -75,7 +75,7 @@ ynh_system_user_create --username=$app
 ynh_script_progression --message="Restoring user rights..."
 
 # Restore permissions on app files
-chown -R $app: $final_path
+chown -R $app: "$final_path"
 chown -R $app: $data_path
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 7cc7354..936df4c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -120,14 +120,6 @@ exec_as $app php${phpversion} "$final_path/admin/cli/upgrade.php" --non-interact
 # Recalculate and store the checksum of the file for the next upgrade.
 ynh_store_file_checksum --file="$final_path/config.php"
 
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions on app files
-chown -R $app: $data_path
-chown -R $app: $final_path
-
 #=================================================
 # ACTIVATE LDAP SUPPORT
 #=================================================