From 133eeb1ceff07c323aeb1fdd795e37c5ce9ada5c Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Sat, 6 May 2017 19:58:45 +0200
Subject: [PATCH 1/2] [fix] Upgrade from 1.3.3

Fix error: Your local changes to the following files would be overwritten by merge:
        .babelrc
        .dockerignore
        .editorconfig
        .env.production.sample
        .gitignore
        .rubocop.yml
        .travis.yml
        Capfile
        Dockerfile
        README.md
        Vagrantfile
        ....
---
 scripts/upgrade | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index ab4bf58..672900f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -41,6 +41,7 @@ sudo systemctl stop mastodon-*.service
 sudo su - $app <<PULLCOMMANDS
 pushd ~/live
 git fetch
+git reset --hard origin/master
 git pull https://github.com/tootsuite/mastodon.git master
 PULLCOMMANDS
 

From 04fc6dcc4be964f55c52016f1b912fb093fd542f Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Sat, 6 May 2017 20:34:29 +0200
Subject: [PATCH 2/2] [fix] Owner of live

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 672900f..b5d1b31 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -37,6 +37,9 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
 # Stop Mastodon Services
 sudo systemctl stop mastodon-*.service
 
+# Change owner of live folder
+sudo chown -R $app: $final_path/live
+
 # Download Mastodon
 sudo su - $app <<PULLCOMMANDS
 pushd ~/live