From f1ea723f4402b1adff2c393e1e7e207f0b301f7b Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 22 Nov 2019 01:24:17 +0100
Subject: [PATCH 1/2] Fix upgrade step

---
 scripts/upgrade | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 38d85ea..5c763a4 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -169,13 +169,18 @@ then
     ynh_script_progression --message="Upgrading source files..." --weight=14
 
     # Download Mastodon
-    mv "$final_path/live" "$final_path/live_back"
+    tmpdir="$(mktemp -d)"
+
+    mkdir $tmpdir/system
+    rsync -a "$final_path/live/public/system" "$tmpdir/."
+    rsync -a "$final_path/live/.env.production" "$tmpdir/."
+    ynh_secure_remove --file="$final_path/live/"
     ynh_setup_source --dest_dir="$final_path/live"
-    if [ -d "$final_path/live_back/public/system" ]; then
-	    rsync -a "$final_path/live_back/public/system" "$final_path/live/public/."
+    if [ -d "$tmpdir/system" ]; then
+	    rsync -a "$tmpdir/system" "$final_path/live/public/."
     fi
-    rsync -a "$final_path/live_back/.env.production" "$final_path/live/."
-    ynh_secure_remove --file="$final_path/live_back/"
+    rsync -a "$tmpdir/.env.production" "$final_path/live/."
+    ynh_secure_remove --file="$tmpdir/"
 
     # Clean files which are not needed anymore
     ynh_secure_remove --file="$final_path/live/config/initializers/timeout.rb"

From 95a5efb60811ae0062e7cda45b6875d979103dd2 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 22 Nov 2019 23:24:09 +0100
Subject: [PATCH 2/2] Fix case of missing system folder

---
 scripts/upgrade | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 5c763a4..edff694 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -172,7 +172,9 @@ then
     tmpdir="$(mktemp -d)"
 
     mkdir $tmpdir/system
-    rsync -a "$final_path/live/public/system" "$tmpdir/."
+    if [ -d "$final_path/live/public/system" ]; 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_setup_source --dest_dir="$final_path/live"