From 4f0adec82e6965dec86d86e49c075421bc548683 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Thu, 9 Apr 2020 15:56:48 +0200
Subject: [PATCH 1/2] Delete message

---
 conf/message | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 conf/message

diff --git a/conf/message b/conf/message
deleted file mode 100644
index 403c4e0..0000000
--- a/conf/message
+++ /dev/null
@@ -1,5 +0,0 @@
-Mastodon was successfully installed :)
-Please open : https://__DOMAIN____PATH_URL__
-The admin email is: __ADMIN_MAIL__
-The admin password is: __ADMIN_PASS__
-If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/mastodon_ynh
\ No newline at end of file

From b957a40f6f8b8139f89b330cf3aa14d800806187 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Thu, 9 Apr 2020 15:57:17 +0200
Subject: [PATCH 2/2] Update upgrade

---
 scripts/upgrade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 0bc44b3..153437b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -182,7 +182,7 @@ then
 	    rsync -a "$final_path/live/public/system" "$tmpdir/."
     fi    
     rsync -a "$final_path/live/.env.production" "$tmpdir/."
-    ynh_secure_remove --file="$final_path/live/"
+    ynh_secure_remove --file="$final_path/live"
     ynh_setup_source --dest_dir="$final_path/live"
 
     # Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292
@@ -192,7 +192,7 @@ then
 	    rsync -a "$tmpdir/system" "$final_path/live/public/."
     fi
     rsync -a "$tmpdir/.env.production" "$final_path/live/."
-    ynh_secure_remove --file="$tmpdir/"
+    ynh_secure_remove --file="$tmpdir"
 
     # Clean files which are not needed anymore
     ynh_secure_remove --file="$final_path/live/config/initializers/timeout.rb"