From 180db2eb3398325c2298a2dc936aa06b610e0c11 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 28 Dec 2019 14:44:18 +0100 Subject: [PATCH 1/4] Fix bundler --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 2519364..8c903b5 100644 --- a/scripts/install +++ b/scripts/install @@ -149,7 +149,7 @@ ynh_script_progression --message="Installing Ruby..." --weight=424 ynh_install_ruby --ruby_version=2.6.5 /opt/rbenv/versions/2.6.5/bin/gem update --system -#/opt/rbenv/versions/2.6.5/bin/gem install bundler --no-document +/opt/rbenv/versions/2.6.5/bin/gem install bundler:1.17.3 --no-document #================================================= # MODIFY A CONFIG FILE diff --git a/scripts/upgrade b/scripts/upgrade index edff694..9c7eaf7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -237,7 +237,7 @@ ynh_script_progression --message="Installing Ruby..." --weight=424 ynh_install_ruby --ruby_version=2.6.5 /opt/rbenv/versions/2.6.5/bin/gem update --system -#/opt/rbenv/versions/2.6.5/bin/gem install bundler +/opt/rbenv/versions/2.6.5/bin/gem install bundler:1.17.3 --no-document #================================================= # MODIFY A CONFIG FILE From e66ed0ee85f58e61dbf90a005090a4ab75f087cc Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 28 Dec 2019 23:50:28 +0100 Subject: [PATCH 2/4] Fix restore step --- scripts/restore | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/restore b/scripts/restore index 5982c94..de19461 100644 --- a/scripts/restore +++ b/scripts/restore @@ -114,6 +114,7 @@ ynh_script_progression --message="Installing Ruby..." --weight=393 ynh_install_ruby --ruby_version=2.6.5 /opt/rbenv/versions/2.6.5/bin/gem update --system +/opt/rbenv/versions/2.6.5/bin/gem install bundler:1.17.3 --no-document #================================================= # RESTORE THE POSTGRESQL DATABASE From 8cc53046fdb7ea048b0a0505aae463a9532134ef Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 29 Dec 2019 13:16:33 +0100 Subject: [PATCH 3/4] Update check_process --- check_process | 1 - 1 file changed, 1 deletion(-) diff --git a/check_process b/check_process index b4eef2b..66a0890 100644 --- a/check_process +++ b/check_process @@ -12,7 +12,6 @@ setup_private=0 setup_public=1 upgrade=1 - upgrade=1 from_commit=2987ccf8b3aa393dbef79b874dfe5839a0ee10da 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. From a85f1bbe2f147fe89098e26a4b17922390eabeeb Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 29 Dec 2019 15:00:25 +0100 Subject: [PATCH 4/4] Update version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index bd1fc77..8991309 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Mastodon is a free, open-source social network.", "fr": "Mastodon est un réseau social gratuit et open source." }, - "version": "3.0.1~ynh1", + "version": "3.0.1~ynh2", "url": "https://github.com/tootsuite/mastodon", "license": "AGPL-3.0-or-later", "maintainer": [