From b9fc55ae810c9be5756c94b64f85759652ba8eaf Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Sat, 29 Apr 2017 23:48:37 +0200
Subject: [PATCH] [fix] Switch branch to tagged release

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

diff --git a/scripts/upgrade b/scripts/upgrade
index f909d05..117a95f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -37,13 +37,19 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
 # Stop Mastodon Services
 sudo systemctl stop mastodon-*.service
 
-# Update Mastodon
-pushd /opt/mastodon/live
-sudo su - $app <<COMMANDS
+# Download Mastodon
+sudo su - $app <<PULLCOMMANDS
 pushd ~/live
 git fetch
 git pull https://github.com/tootsuite/mastodon.git master
-git checkout $(git tag | tail -n 1)
+PULLCOMMANDS
+
+# Switch branch to tagged release
+pushd /opt/mastodon/live
+sudo git checkout $(git tag | tail -n 1)
+
+# Apply Mastodon upgrade
+sudo su - $app <<COMMANDS
 bin/bundle install
 yarn install --pure-lockfile
 RAILS_ENV=production bundle exec rails assets:clean