From 7ca04c54256ccdd516a4869973f66b9f34cdf2ce Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Fri, 8 Jun 2018 15:37:06 +0200
Subject: [PATCH] Fix Upgrade yarn not installed

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

diff --git a/scripts/upgrade b/scripts/upgrade
index c151b57..4ceea66 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -141,10 +141,11 @@ MCOMMANDS
 
 # Apply Mastodon upgrade
 (
-sudo su - $app <<COMMANDS
-pushd ~/live
 RAILS_ENV=production $final_path/.rbenv/versions/2.5.1/bin/bundle exec rails assets:clean
 RAILS_ENV=production $final_path/.rbenv/versions/2.5.1/bin/bundle exec rails assets:precompile
+
+sudo su - $app <<COMMANDS
+pushd ~/live
 RAILS_ENV=production $final_path/.rbenv/versions/2.5.1/bin/bundle exec rails db:migrate
 # Upgrade to 2.2.0
 RAILS_ENV=production $final_path/.rbenv/versions/2.5.1/bin/bundle exec rails mastodon:maintenance:remove_regeneration_markers