From 8f88641088a09aa466d6d2de760d9470b3d4d322 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Sun, 28 May 2017 17:31:51 +0200
Subject: [PATCH 1/7] upgrade from pre-release

---
 scripts/install | 4 +---
 scripts/upgrade | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/scripts/install b/scripts/install
index 1634c52..ebe4569 100644
--- a/scripts/install
+++ b/scripts/install
@@ -95,11 +95,9 @@ CLONECOMMANDS
 
 # Switch branch to tagged release
 cd $final_path/live
-url=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest | sort -r | head -1 | cut -d\" -f4)
-version=$(echo $url | cut -d/ -f8)
 sudo su - $app <<SWITCHCOMMANDS
 pushd ~/live
-git checkout $version
+git checkout $(git tag | tail -n 1)
 SWITCHCOMMANDS
 
 # Be king rewind (/var/cache/yunohost/from_file/scripts)
diff --git a/scripts/upgrade b/scripts/upgrade
index 529c124..979e005 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -50,11 +50,9 @@ PULLCOMMANDS
 
 # Switch branch to tagged release
 cd $final_path/live
-url=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest | sort -r | head -1 | cut -d\" -f4)
-version=$(echo $url | cut -d/ -f8)
 sudo su - $app <<SWITCHCOMMANDS
 pushd ~/live
-git checkout $version
+git checkout $(git tag | tail -n 1)
 SWITCHCOMMANDS
 
 # upgrade Node.js v4 to v6

From f224a7d13c67fe5a3d29fcec34dcfbf1b798be9f Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Thu, 10 Aug 2017 18:11:34 +0200
Subject: [PATCH 2/7] New method to select pre-release

---
 scripts/install | 2 +-
 scripts/upgrade | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index b088eca..28564cf 100644
--- a/scripts/install
+++ b/scripts/install
@@ -104,7 +104,7 @@ CLONECOMMANDS
 cd $final_path/live
 sudo su - $app <<SWITCHCOMMANDS
 pushd ~/live
-git checkout $(git tag | tail -n 1)
+git checkout $(git tag -l | sort -V | tail -n 1)
 SWITCHCOMMANDS
 
 # Be king rewind (/var/cache/yunohost/from_file/scripts)
diff --git a/scripts/upgrade b/scripts/upgrade
index 5c64116..371593e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -52,7 +52,7 @@ PULLCOMMANDS
 cd $final_path/live
 sudo su - $app <<SWITCHCOMMANDS
 pushd ~/live
-git checkout $(git tag | tail -n 1)
+git checkout $(git tag -l | sort -V | tail -n 1)
 SWITCHCOMMANDS
 
 # upgrade Node.js v4 to v6

From 099de1658ff1e78c7c4f75c85b1dc496627ee3d0 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Thu, 7 Sep 2017 23:04:29 +0200
Subject: [PATCH 3/7] Remove prepare_for_foreign_keys

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 371593e..11f9966 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -72,7 +72,7 @@ pushd ~/live
 bin/bundle install
 yarn install --pure-lockfile
 # For 1.4.1 -> 1.4.2 migration prepare_for_foreign_keys is needed
-RAILS_ENV=production bundle exec rails mastodon:maintenance:prepare_for_foreign_keys
+# RAILS_ENV=production bundle exec rails mastodon:maintenance:prepare_for_foreign_keys
 RAILS_ENV=production bundle exec rails assets:clean
 RAILS_ENV=production bundle exec rails assets:precompile
 RAILS_ENV=production bundle exec rails db:migrate

From 502e75555bd83719746ca5c09fc18ce836cd4cb8 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Wed, 11 Oct 2017 18:59:24 +0200
Subject: [PATCH 4/7] Upgrade to ruby 2.5.2 for release 2.0

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 11f9966..0c818cd 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -66,6 +66,23 @@ fi
 # add additional package for release 1.4
 ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev
 
+# Install ruby 2.5.2 for release 2.0
+sudo su - $app <<RCOMMANDS
+/opt/mastodon/.rbenv/bin/rbenv install 2.5.2
+/opt/mastodon/.rbenv/versions/2.5.2/bin/ruby -v
+RCOMMANDS
+
+# Create symlink for ruby 2.5.2
+sudo ln -s /opt/mastodon/.rbenv/versions/2.5.2/bin/ruby /usr/bin/ruby || true
+
+# Install Mastodon
+sudo su - $app <<MCOMMANDS
+pushd ~/live
+/opt/mastodon/.rbenv/versions/2.5.2/bin/gem install bundler
+bin/bundle install --deployment --without development test
+yarn install --production
+MCOMMANDS
+
 # Apply Mastodon upgrade
 sudo su - $app <<COMMANDS
 pushd ~/live

From e5995887c0b96201db05d860493b119517f40607 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Wed, 11 Oct 2017 21:22:47 +0200
Subject: [PATCH 5/7] Fix to 2.4.2

---
 scripts/upgrade | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 0c818cd..0832e99 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -66,19 +66,21 @@ fi
 # add additional package for release 1.4
 ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev
 
-# Install ruby 2.5.2 for release 2.0
+# Install ruby 2.4.2 for release 2.0
 sudo su - $app <<RCOMMANDS
-/opt/mastodon/.rbenv/bin/rbenv install 2.5.2
-/opt/mastodon/.rbenv/versions/2.5.2/bin/ruby -v
+cd $final_path/.rbenv && git pull && cd -
+cd $final_path/.rbenv/plugins/ruby-build && git pull && cd -
+$final_path/.rbenv/bin/rbenv install 2.4.2
+$final_path/.rbenv/versions/2.4.2/bin/ruby -v
 RCOMMANDS
 
-# Create symlink for ruby 2.5.2
-sudo ln -s /opt/mastodon/.rbenv/versions/2.5.2/bin/ruby /usr/bin/ruby || true
+# Create symlink for ruby 2.4.2
+sudo ln -s $final_path/.rbenv/versions/2.4.2/bin/ruby /usr/bin/ruby || true
 
 # Install Mastodon
 sudo su - $app <<MCOMMANDS
 pushd ~/live
-/opt/mastodon/.rbenv/versions/2.5.2/bin/gem install bundler
+$final_path/.rbenv/versions/2.4.2/bin/gem install bundler
 bin/bundle install --deployment --without development test
 yarn install --production
 MCOMMANDS

From 85918b2b3e43441c1d2dc821c9a0162da9089ce2 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Wed, 11 Oct 2017 21:26:13 +0200
Subject: [PATCH 6/7] Fix rbenv install error

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 0832e99..7384e42 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -70,7 +70,7 @@ ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libi
 sudo su - $app <<RCOMMANDS
 cd $final_path/.rbenv && git pull && cd -
 cd $final_path/.rbenv/plugins/ruby-build && git pull && cd -
-$final_path/.rbenv/bin/rbenv install 2.4.2
+$final_path/.rbenv/bin/rbenv install 2.4.2 || true
 $final_path/.rbenv/versions/2.4.2/bin/ruby -v
 RCOMMANDS
 

From 244edb7dc5c84be752e6978abbe59e9b73f521b1 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Wed, 11 Oct 2017 21:30:51 +0200
Subject: [PATCH 7/7] Remove duplicated bundle install and yarn install

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 7384e42..682df3e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -82,14 +82,14 @@ sudo su - $app <<MCOMMANDS
 pushd ~/live
 $final_path/.rbenv/versions/2.4.2/bin/gem install bundler
 bin/bundle install --deployment --without development test
-yarn install --production
+yarn install --pure-lockfile
 MCOMMANDS
 
 # Apply Mastodon upgrade
 sudo su - $app <<COMMANDS
 pushd ~/live
-bin/bundle install
-yarn install --pure-lockfile
+#bin/bundle install
+#yarn install --pure-lockfile
 # For 1.4.1 -> 1.4.2 migration prepare_for_foreign_keys is needed
 # RAILS_ENV=production bundle exec rails mastodon:maintenance:prepare_for_foreign_keys
 RAILS_ENV=production bundle exec rails assets:clean