From 3b3f95cfe38c83499a183518038c4db8119a3acf Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Sat, 29 Apr 2017 23:58:25 +0200
Subject: [PATCH 1/4] [enh] Switch tagged release on install

Work with 1.3.2
---
 scripts/install | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/install b/scripts/install
index 5d1e75e..1b82828 100644
--- a/scripts/install
+++ b/scripts/install
@@ -89,6 +89,10 @@ git clone https://github.com/rbenv/ruby-build.git $final_path/.rbenv/plugins/rub
 git clone https://github.com/tootsuite/mastodon.git $final_path/live
 CLONECOMMANDS
 
+# Switch to tagged release
+pushd $final_path/live
+sudo git checkout $(git tag | tail -n 1)
+
 # Be king rewind (/var/cache/yunohost/from_file/scripts)
 popd
 

From 5bcc59f37c0512c9c2adf6f3946770ade60f0f96 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Sun, 30 Apr 2017 00:01:11 +0200
Subject: [PATCH 2/4] [enh] Switch to tagged release on upgrade

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 07b3ee7..d1f985e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -37,12 +37,20 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
 # Stop Mastodon Services
 sudo systemctl stop mastodon-*.service
 
-# Update Mastodon
-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
+pushd ~/live
 bin/bundle install
 yarn install --pure-lockfile
 RAILS_ENV=production bundle exec rails assets:clean

From bf0b5ad36b12dc5516ce7429da2ded28e4904209 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Sun, 30 Apr 2017 00:35:01 +0200
Subject: [PATCH 3/4] [fix] popd on services file copy

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 1b82828..263a8dd 100644
--- a/scripts/install
+++ b/scripts/install
@@ -162,7 +162,7 @@ type rbenv
 BCOMMANDS
 
 # Add Services
-pushd $(popd)
+popd
 
 sudo cp ../conf/mastodon-web.service /etc/systemd/system/mastodon-web.service
 sudo chown root: /etc/systemd/system/mastodon-web.service

From 003c40c9e823b164126b6b18f7f90b9be9b0b5d8 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Sun, 30 Apr 2017 00:53:56 +0200
Subject: [PATCH 4/4] [fix] change pushd to cd

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 263a8dd..b36c8f2 100644
--- a/scripts/install
+++ b/scripts/install
@@ -90,7 +90,7 @@ git clone https://github.com/tootsuite/mastodon.git $final_path/live
 CLONECOMMANDS
 
 # Switch to tagged release
-pushd $final_path/live
+cd $final_path/live
 sudo git checkout $(git tag | tail -n 1)
 
 # Be king rewind (/var/cache/yunohost/from_file/scripts)