From 0963d081aad00c2657c01affcb6d3f970c742186 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 6 Jan 2021 01:46:32 +0100
Subject: [PATCH] Upgrade to 3.3.0~ynh1

---
 README.md          |  2 +-
 README_fr.md       |  2 +-
 check_process      |  4 ++++
 conf/app.src       |  4 ++--
 manifest.json      |  2 +-
 scripts/_common.sh | 12 +++---------
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 19b1ee1..dc0c3c2 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 ## Overview
 Mastodon is a free, open-source microblogging social network. It is a decentralized alternative to commercial platforms like Twitter and avoids the risks of a single company monopolizing your communication for commercial purposes. 
 
-**Shipped version:** 3.2.2
+**Shipped version:** 3.3.0
 
 ## Important points to read before installing
 
diff --git a/README_fr.md b/README_fr.md
index 6c6ee1e..5f41969 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 ## Vue d'ensemble
 Mastodon est un réseau social de microblog auto-hébergé et open source. C'est une alternative décentralisée aux plates-formes commerciales comme Twitter. Mastodon évite ainsi les risques qu'une seule société monopolise votre communication à des fins commerciales.
 
-**Version incluse:** 3.2.2
+**Version incluse:** 3.3.0
 
 ## Points importants à lire avant l'installation
 
diff --git a/check_process b/check_process
index 6fbc748..233a374 100644
--- a/check_process
+++ b/check_process
@@ -25,6 +25,8 @@
 		upgrade=1	from_commit=248b717f373f3c82bdb19c33cf20980494608697
 		# 3.2.1~ynh2
 		upgrade=1	from_commit=74908bf3e70c134bc838c7db3ae8b5aa0938cd75
+		# 3.2.2~ynh1
+		upgrade=1	from_commit=a233ccc644d97aa89756fac9f0ce68c98d81d27c
 		backup_restore=1
 		multi_instance=1
 		# This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version.
@@ -50,3 +52,5 @@ Notification=all
 		name=3.2.1~ynh1
 	; commit=74908bf3e70c134bc838c7db3ae8b5aa0938cd75
 		name=3.2.1~ynh2
+	; commit=a233ccc644d97aa89756fac9f0ce68c98d81d27c
+		name=3.2.2~ynh1
diff --git a/conf/app.src b/conf/app.src
index 5d0c0b4..1f196ca 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.2.2.tar.gz
-SOURCE_SUM=298396b1bd0065689c3d9225c8466c6651979834acb4eec511057ff1ba630781 
+SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.3.0.tar.gz
+SOURCE_SUM=ffbaeaf18d9c440ac61c6c5c29fd6581b88c1d2843170f2cb5f0fcf8dcc0ecd6 
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 1fc7555..3dcd20d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "A libre and federated social network.",
         "fr": "Un réseau social libre et fédéré."
     },
-    "version": "3.2.2~ynh1",
+    "version": "3.3.0~ynh1",
     "url": "https://github.com/tootsuite/mastodon",
     "license": "AGPL-3.0-or-later",
     "maintainer": [
diff --git a/scripts/_common.sh b/scripts/_common.sh
index ad4ed8e..1c28aec 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -9,15 +9,9 @@ pkg_dependencies="imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git
 
 MEMORY_NEEDED="2560"
 
-if [ "$(lsb_release --codename --short)" = "buster" ]; then
-    RUBY_VERSION="2.6.6"
-    BUNDLER_VERSION="1.17.3"
-    NODEJS_VERSION="12"
-else
-    RUBY_VERSION="2.6.5"
-    BUNDLER_VERSION="1.17.3"
-    NODEJS_VERSION="10"
-fi
+RUBY_VERSION="2.7.2"
+BUNDLER_VERSION="1.17.3"
+NODEJS_VERSION="12"
 
 #=================================================
 # PERSONAL HELPERS