aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornemsia <nemsia@nemsia.org>2017-07-01 17:26:42 +0200
committernemsia <nemsia@nemsia.org>2017-07-01 17:26:42 +0200
commit6acd2c741667b6cd2b72ecca5d7fe7a36eb4d6db (patch)
tree4193e25b725287af1e23e467a89887919f13dc3c
parentcbbae3d3e8d52b5cf2ddb7fe2a77c67a4996d7af (diff)
parent140824e76a478a4d48b93e81f3bcb25c6d38add8 (diff)
downloadmastodon_ynh-6acd2c741667b6cd2b72ecca5d7fe7a36eb4d6db.tar.gz
mastodon_ynh-6acd2c741667b6cd2b72ecca5d7fe7a36eb4d6db.tar.bz2
mastodon_ynh-6acd2c741667b6cd2b72ecca5d7fe7a36eb4d6db.zip
Merge remote-tracking branch 'refs/remotes/YunoHost-Apps/master'
-rw-r--r--README.md4
-rw-r--r--scripts/install5
-rw-r--r--scripts/upgrade5
3 files changed, 8 insertions, 6 deletions
diff --git a/README.md b/README.md
index e6aae5e..3cd6796 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,12 @@
[![Yunohost version](https://img.shields.io/badge/yunohost-2.5.6_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)
+:warning: Cette application ne fonctionne que sur x86, x86_64 et non sur ARM (Raspberry,Olimex,Labriqueinternet,...). T_T
+
:warning: Cette application utilise les packages backports de Debian, nous vous recommendons de ne pas installer cette application directement en production
+:warning: This app work only on x86, x86_64 and not on ARM (Raspberry,Olimex,InternetCube,...). T_T
+
:warning: This application uses the Debian backports packages, do not install this application directly in production
## Mastodon c'est quoi ?
diff --git a/scripts/install b/scripts/install
index e747241..a4faed3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -95,11 +95,10 @@ CLONECOMMANDS
# Switch branch to tagged release
cd $final_path/live
-url=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest | sort -r | head -1 | cut -d\" -f4)
-version=$(echo $url | cut -d/ -f8)
+version=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest | grep tag_name | cut -d\" -f4)
sudo su - $app <<SWITCHCOMMANDS
pushd ~/live
-git checkout $(git tag | tail -n 1)
+git checkout $version
SWITCHCOMMANDS
# Be king rewind (/var/cache/yunohost/from_file/scripts)
diff --git a/scripts/upgrade b/scripts/upgrade
index 5be8dbe..a741c4d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -50,11 +50,10 @@ PULLCOMMANDS
# Switch branch to tagged release
cd $final_path/live
-url=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest | sort -r | head -1 | cut -d\" -f4)
-version=$(echo $url | cut -d/ -f8)
+version=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest | grep tag_name | cut -d\" -f4)
sudo su - $app <<SWITCHCOMMANDS
pushd ~/live
-git checkout $(git tag | tail -n 1)
+git checkout $version
SWITCHCOMMANDS
# upgrade Node.js v4 to v6