From e05277a8fe369ba4cfdd66e93b2b93d6c1377201 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Mon, 24 Apr 2017 23:54:57 +0200
Subject: [PATCH 1/4] [fix] Stop streaming on remove

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

diff --git a/scripts/remove b/scripts/remove
index 6ddf97b..373d028 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -32,7 +32,7 @@ fi
 # Stop mastodon-sidekiq
 if [ -e "/etc/systemd/system/mastodon-streaming.service" ]; then
 	echo "Delete systemd script"
-	sudo systemctl stop mastodon-sidekiq.streaming
+	sudo systemctl stop mastodon-streaming.service
 	ynh_secure_remove "/etc/systemd/system/mastodon-streaming.service"
 	sudo systemctl disable mastodon-streaming.service
 fi

From 9d73a23ac8fbe8b45071afb3ee9b9ad7700b9ecf Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Thu, 27 Apr 2017 22:34:49 +0200
Subject: [PATCH 2/4] [enh] Install tagged release

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

diff --git a/scripts/install b/scripts/install
index ed2b1e7..67e69b0 100644
--- a/scripts/install
+++ b/scripts/install
@@ -87,6 +87,8 @@ sudo su - $app <<CLONECOMMANDS
 git clone https://github.com/rbenv/rbenv.git $final_path/.rbenv
 git clone https://github.com/rbenv/ruby-build.git $final_path/.rbenv/plugins/ruby-build
 git clone https://github.com/tootsuite/mastodon.git $final_path/live
+cd $final_path/live
+git checkout $(git tag | tail -n 1)
 CLONECOMMANDS
 
 # Be king rewind (/var/cache/yunohost/from_file/scripts)

From 3a936561602b8ec357ce34cd4be0252ff4fef8bd Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Fri, 28 Apr 2017 18:02:28 +0200
Subject: [PATCH 3/4] [fix] Install tagged release

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

diff --git a/scripts/install b/scripts/install
index 67e69b0..d58f08e 100644
--- a/scripts/install
+++ b/scripts/install
@@ -82,12 +82,13 @@ sudo su -c "psql" postgres <<< \
 ynh_psql_create_db_without_password "$app"
 sudo systemctl restart postgresql
 
-# Download all Ruby source
+# Download all sources rbenv, ruby and mastodon
+pushd $final_path/live
 sudo su - $app <<CLONECOMMANDS
 git clone https://github.com/rbenv/rbenv.git $final_path/.rbenv
 git clone https://github.com/rbenv/ruby-build.git $final_path/.rbenv/plugins/ruby-build
 git clone https://github.com/tootsuite/mastodon.git $final_path/live
-cd $final_path/live
+pushd $final_path/live
 git checkout $(git tag | tail -n 1)
 CLONECOMMANDS
 

From 58661b14d2fe6ff2dc12b2c30607fc5407a3ccb5 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Fri, 28 Apr 2017 18:07:45 +0200
Subject: [PATCH 4/4] [fix] Upgrade on tagged release

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 076e3fb..bd9c46a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -38,8 +38,9 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
 sudo systemctl stop mastodon-*.service
 
 # Update Mastodon
+pushd /opt/mastodon/live
 sudo su - $app <<COMMANDS
-cd live
+pushd ~/live
 git fetch
 git pull https://github.com/tootsuite/mastodon.git master
 git checkout $(git tag | tail -n 1)