Merge pull request #239 from YunoHost-Apps/testing

Upgrade 3.2.1

8 files changed, 13 insertions, 34 deletions

diff --git a/README.md b/README.md
index 590b11d..400138c 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.0 (3.1.2 on Jessie)
+**Shipped version:** 3.2.1
 
 ## Important points to read before installing
 
diff --git a/README_fr.md b/README_fr.md
index 9b2367e..548c3e6 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.0 (3.1.2 on Jessie)
+**Version incluse:** 3.2.1
 
 ## Points importants à lire avant l'installation
 
diff --git a/check_process b/check_process
index 0d29e43..9338fb7 100644
--- a/check_process
+++ b/check_process
@@ -19,6 +19,8 @@
 		upgrade=1	from_commit=6b30109fc986d83166b1805ec3ad7e28200e3743
 		# 3.1.2~ynh4
 		upgrade=1	from_commit=d3df899e0a99a63ee1cf7ad845cc513aeaaf30ef
+		# 3.2.0~ynh1
+		upgrade=1	from_commit=bde14cc4496445fdfed4616ac44fc9527c8369fd
 		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.
@@ -38,3 +40,5 @@ Notification=all
 		name=3.1.2~ynh3
 	; commit=d3df899e0a99a63ee1cf7ad845cc513aeaaf30ef
 		name=3.1.2~ynh4
+	; commit=bde14cc4496445fdfed4616ac44fc9527c8369fd
+		name=3.2.0~ynh1
diff --git a/conf/app.src b/conf/app.src
index 920f9da..571866d 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.2.0.tar.gz
-SOURCE_SUM=7ab99ccc6d6ce2ac2d5aea82a2fc057dd357126cb572e4fb39531931dc078904 
+SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.2.1.tar.gz
+SOURCE_SUM=429dbe1166948e2863dd97b7d5458d18887e7a75b7ff5005cfa50828f9c7b9e2 
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/jessie.src b/conf/jessie.src
deleted file mode 100644
index fc275ee..0000000
--- a/conf/jessie.src
+++ /dev/null
@@ -1,6 +0,0 @@
-SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.1.2.tar.gz
-SOURCE_SUM=c12fd8c1b426861825d37d2eab1d6356be05b2b321eae0c1b87f80fcc11b0da7 
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
diff --git a/manifest.json b/manifest.json
index d516472..84dbe56 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.0~ynh1",
+    "version": "3.2.1~ynh1",
     "url": "https://github.com/tootsuite/mastodon",
     "license": "AGPL-3.0-or-later",
     "maintainer": [
@@ -23,7 +23,7 @@
         }
     ],
     "requirements": {
-        "yunohost": ">= 3.8.2"
+        "yunohost": ">= 4.0"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/install b/scripts/install
index 0c92114..01a2efc 100644
--- a/scripts/install
+++ b/scripts/install
@@ -102,18 +102,7 @@ ynh_script_progression --message="Setting up source files..."
 
 ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
-mkdir $final_path
-
-if [ "$(lsb_release --codename --short)" = "buster" ]; then
-    ynh_setup_source --dest_dir="$final_path/live"
-else
-    ynh_script_progression --message="Setting up source files..."
-
-    ynh_setup_source --dest_dir="$final_path/live" --source_id=jessie
-    
-    # Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292
-    ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock"
-fi
+ynh_setup_source --dest_dir="$final_path/live"
 
 #=================================================
 # NGINX CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index f10087a..2914550 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -183,16 +183,8 @@ then
 	fi
 	rsync -a "$config" "$tmpdir/."
 	ynh_secure_remove --file="$final_path/live"
-	if [ "$(lsb_release --codename --short)" = "buster" ]; then
-        ynh_setup_source --dest_dir="$final_path/live"
-    else
-        ynh_script_progression --message="Setting up source files..."
-
-        ynh_setup_source --dest_dir="$final_path/live" --source_id=jessie
-    
-        # Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292
-        ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock"
-    fi
+	
+	ynh_setup_source --dest_dir="$final_path/live"
 
 	if [ -d "$final_path/system.tmp" ]; then
 		mv --verbose --no-target-directory "$final_path/system.tmp" "$final_path/live/public/system"