Upgrade to 2.5.0

6 files changed, 11 insertions, 13 deletions

diff --git a/README.md b/README.md
index cce244f..d81ad4a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Mastodon for YunoHost
 
-[![Latest Version](https://img.shields.io/badge/version-2.4.5-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases)
+[![Latest Version](https://img.shields.io/badge/version-2.5.0-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases)
 [![Status](https://img.shields.io/badge/status-testing-yellow.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/milestones)
 [![Dependencies](https://img.shields.io/badge/dependencies-includes-lightgrey.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh#dependencies)
 [![GitHub license](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat)](https://raw.githubusercontent.com/YunoHost-Apps/mastodon_ynh/master/LICENSE)
diff --git a/conf/app-mastodon.src b/conf/app-mastodon.src
index a63adff..1c248c1 100644
--- a/conf/app-mastodon.src
+++ b/conf/app-mastodon.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.4.5.tar.gz
-SOURCE_SUM=9e8cf6a808c9c34b6b609e8acc86b91a02227580b61221d96a4b78560fcc592c
+SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.5.0.tar.gz
+SOURCE_SUM=0b36693058647ab50fff7f1c0c678f0f2b2997908c542c488386e8e16beced74
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 75ea654..7af1040 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,7 +9,7 @@
 		"en": "Mastodon is a free, open-source social network.",
 		"fr": "Mastodon est un réseau social gratuit et open source."
 	},
-	"version": "2.4.5",
+	"version": "2.5.0",
 	"url": "https://github.com/tootsuite/mastodon",
 	"license": "AGPL-3.0-or-later",
 	"maintainer": {
diff --git a/scripts/install b/scripts/install
index 5d5bf1e..0959371 100644
--- a/scripts/install
+++ b/scripts/install
@@ -94,7 +94,7 @@ ynh_app_setting_set "$app" final_path "$final_path"
 # TODO: use https://github.com/YunoHost-Apps/Experimental_helpers/blob/master/ynh_install_nodejs/ynh_install_nodejs
 (
 	cd /opt
-	curl -sL https://deb.nodesource.com/setup_6.x | bash -
+	curl -sL https://deb.nodesource.com/setup_8.x | bash -
 	apt-get -y install nodejs
 )
 
diff --git a/scripts/restore b/scripts/restore
index a8dc79f..1682d23 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -99,7 +99,7 @@ ynh_package_update
 # TODO: use https://github.com/YunoHost-Apps/Experimental_helpers/blob/master/ynh_install_nodejs/ynh_install_nodejs
 (
 	cd /opt
-	curl -sL https://deb.nodesource.com/setup_6.x | bash -
+	curl -sL https://deb.nodesource.com/setup_8.x | bash -
 	apt-get -y install nodejs
 )
 
diff --git a/scripts/upgrade b/scripts/upgrade
index c6b7a83..b80ecdb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -86,14 +86,12 @@ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.lis
 # INSTALL DEPENDENCIES
 #=================================================
 
-# upgrade Node.js v4 to v6
+# upgrade Node.js to v8
 # TODO: use https://github.com/YunoHost-Apps/Experimental_helpers/blob/master/ynh_install_nodejs/ynh_install_nodejs
-node_version=$(nodejs --version)
-if [[ $node_version =~ ^v4.*$  ]]; then
-	pushd /opt
-	curl -sL https://deb.nodesource.com/setup_6.x | sudo bash -
-	sudo apt-get -y install nodejs
-fi
+pushd /opt
+curl -sL https://deb.nodesource.com/setup_8.x | sudo bash -
+sudo apt-get -y install nodejs
+popd
 
 # add additional package for upgrade
 ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev postgresql-server-dev-all