From bd73569c6eb8611f3cb135161499063b18df1219 Mon Sep 17 00:00:00 2001
From: tituspijean <tituspijean@outlook.com>
Date: Sun, 22 Sep 2019 15:35:35 +0200
Subject: [PATCH] [upg] v0.1.0-beta.10 and [fix] install (#121)

* [upg] v0.1.0-beta.10 (#120)

* [fix] do not set flarum/core version

* [fix] secure remove tmp and log folders
---
 scripts/_common.sh | 6 +++---
 scripts/install    | 2 --
 scripts/remove     | 4 ++--
 scripts/upgrade    | 2 --
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 01d22f7..532b50a 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -7,9 +7,9 @@ pkg_dependencies="php7.3-curl php7.3-dom php7.3-gd php7.3-json php7.3-mbstring p
 
 # Version numbers
 php_version="7.3"
-project_version="0.1.0-beta.9"
-core_version="0.1.0-beta.9"
-ssowat_version="0.1.0-beta.9-1"
+project_version="0.1.0-beta.10"
+core_version="0.1.0-beta.10"
+ssowat_version="0.1.0-beta.10-1"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index c464c2d..a2ff33c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -130,8 +130,6 @@ ynh_script_progression --message="Composer is installing Flarum and its dependen
 
 # First, create the project with core and all basic extensions
 ynh_composer_exec $app $php_version $final_path "create-project flarum/flarum=$project_version $tmp --stability=beta --ansi -d $tmp"
-# Let's fix the core version by explicitely requiring it
-ynh_composer_exec $app $php_version $final_path "require flarum/core:$core_version -n --ansi -d $tmp"
 
 # Copy Flarum to working directory and clean temp directory
 cp -Rf $tmp/* $final_path
diff --git a/scripts/remove b/scripts/remove
index 33ae0a0..a3bd250 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -82,11 +82,11 @@ ynh_remove_logrotate
 #=================================================
 
 # Remove a temp directory securely
-ynh_secure_remove --file="/tmp/$app/"
+ynh_secure_remove --file="/tmp/$app"
 ynh_secure_remove --file="/tmp/${app}backup"
 
 # Remove the log files
-ynh_secure_remove --file="/var/log/$app/"
+ynh_secure_remove --file="/var/log/$app"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 4ecdc74..8cbf5e6 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -201,8 +201,6 @@ if [[ $(dpkg --compare-versions $old_project_version lt "0.1.0-beta.8" && echo t
 
 	# First, create the project with core and all basic extensions
 	ynh_composer_exec $app $php_version $final_path "create-project flarum/flarum=$project_version $tmp --stability=beta --ansi -d $tmp"
-	# Let's fix the core version by explicitely requiring it
-	ynh_composer_exec $app $php_version $final_path "require flarum/core:$core_version -n --ansi -d $tmp"
 
 	# Copy Flarum to working directory
 	cp -Rf $tmp/* $final_path