aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornemsia <nemsia@nemsia.org>2018-06-12 21:43:34 +0200
committernemsia <nemsia@nemsia.org>2018-06-12 21:43:34 +0200
commit7c2d4d49273ad4af01e9a666254561f269272bbd (patch)
tree140750a7f2a27bead12af5085110755175f2b76b
parent982f3bbde2178906fd1b8244a2bc207281b8a4ea (diff)
downloadmastodon_ynh-7c2d4d49273ad4af01e9a666254561f269272bbd.tar.gz
mastodon_ynh-7c2d4d49273ad4af01e9a666254561f269272bbd.tar.bz2
mastodon_ynh-7c2d4d49273ad4af01e9a666254561f269272bbd.zip
Update to 2.4.1 + fixs
*Fix upgrade,restore scripts * Readme and manifest to 2.4.1
-rw-r--r--README.md4
-rw-r--r--manifest.json2
-rw-r--r--scripts/restore4
-rw-r--r--scripts/upgrade2
4 files changed, 6 insertions, 6 deletions
diff --git a/README.md b/README.md
index 103ebcd..488481d 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
# Mastodon for YunoHost
-[![Latest Version](https://img.shields.io/badge/version-2.4.0-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases)
+[![Latest Version](https://img.shields.io/badge/version-2.4.1-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)
-[![Yunohost version](https://img.shields.io/badge/yunohost-2.7.7_tested-orange.svg?style=flat)](https://github.com/YunoHost/yunohost)
+[![Yunohost version](https://img.shields.io/badge/yunohost-2.7.12_tested-orange.svg?style=flat)](https://github.com/YunoHost/yunohost)
[![GitHub issues](https://img.shields.io/github/issues/YunoHost-Apps/mastodon_ynh.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/issues)
[![Install Mastodon with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=mastodon)
diff --git a/manifest.json b/manifest.json
index 3e6e9b4..11c277b 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.0",
+ "version": "2.4.1",
"url": "https://github.com/tootsuite/mastodon",
"license": "AGPL-3.0-or-later",
"maintainer": {
diff --git a/scripts/restore b/scripts/restore
index a800966..0d32504 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -89,10 +89,10 @@ fi
# Install source.list debian package backports & yarn
if [ "$(lsb_release --codename --short)" == "jessie" ]; then
- cp ../conf/backports.list /etc/apt/sources.list.d/
+ cp ../conf/apt_backports.list /etc/apt/sources.list.d/
fi
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-cp ../conf/yarn.list /etc/apt/sources.list.d/
+cp ../conf/apt_yarn.list /etc/apt/sources.list.d/yarn.list
ynh_package_update
# Install de Node.js
diff --git a/scripts/upgrade b/scripts/upgrade
index 3858ee8..53e1828 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -115,7 +115,7 @@ ynh_setup_source "$final_path/.rbenv/plugins/ruby-build" "app-ruby-build"
# Install ruby 2.5.1
(
- exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.5.1 || true
+ exec_as "$app" $final_path/.rbenv/bin/rbenv install -s 2.5.1 || true
exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.1 || true
exec_as "$app" $final_path/.rbenv/versions/2.5.1/bin/ruby -v
)