aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornemsia <nemsia@nemsia.org>2017-05-29 13:59:31 +0200
committernemsia <nemsia@nemsia.org>2017-05-29 13:59:31 +0200
commit698eb6abc43286c895d8bd25ac2aba23efb2b9ff (patch)
treecb0c0a199c05f86afdb41c4380b1c17bcf22f2a3
parent30c19b5b1ce6fa9400ef6260abf36ef6982b5bb4 (diff)
parentb122acd183dd4a5cace84d8bb436659059ab7047 (diff)
downloadmastodon_ynh-698eb6abc43286c895d8bd25ac2aba23efb2b9ff.tar.gz
mastodon_ynh-698eb6abc43286c895d8bd25ac2aba23efb2b9ff.tar.bz2
mastodon_ynh-698eb6abc43286c895d8bd25ac2aba23efb2b9ff.zip
Merge remote-tracking branch 'refs/remotes/YunoHost-Apps/master'
-rw-r--r--README.md28
-rw-r--r--manifest.json2
-rw-r--r--scripts/install2
-rw-r--r--scripts/upgrade2
4 files changed, 3 insertions, 31 deletions
diff --git a/README.md b/README.md
index fa352a0..0b213d0 100644
--- a/README.md
+++ b/README.md
@@ -23,20 +23,6 @@ Mastodon est un réseau social gratuit et open source. Une alternative décentra
L'utilisateur admin est crée automatiquement comme: user@domain.tld
-<del>Une fois l'installation effectuée, vous pouvez créer un compte manuellement sur Mastodon depuis votre navigateur. Lorsque vous avez crée le premier utilisateur vous pouvez créer l'administrateur de votre Mastodon. Pour celà, il faut impérativement passer par une interface en ligne de commande et taper les commandes suivantes :</del>
-
-<del>**se connecter en sudo sur l'utilisateur**</del>
-
-<del>`$ sudo su mastodon`</del>
-
-<del>**se placer dans le répertoire où est installé Mastodon**</del>
-
-<del>`$ cd /opt/mastodon/live`</del>
-
-<del>**lancer la commande de création de l'administrateur**</del>
-
-<del>`$ RAILS_ENV=production bin/bundle exec rails mastodon:make_admin USERNAME=*Nom de votre utilisateur*`</del>
-
### Mise à jour
`$ sudo yunohost app upgrade --verbose mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh.git`
@@ -59,20 +45,6 @@ Mastodon is a free, open-source social network. A decentralized alternative to c
The admin user is automatically created as: user@domain.tld
-<del>After installation, you can create an account manually on Mastodon from your browser. When you have created the first user you can create the administrator of your Mastodon. For this, it is imperative to go through a command line and type the following commands:</del>
-
-<del>**sudo to the user**</del>
-
-<del>`$ sudo su mastodon`</del>
-
-<del>**change directory where Mastodon is installed**</del>
-
-<del>`$ cd /opt/mastodon/live`</del>
-
-<del>**launch the command to create the administrator**</del>
-
-<del>`$ RAILS_ENV=production bin/bundle exec rails mastodon:make_admin USERNAME=*username*`</del>
-
### Update
`$ sudo yunohost app upgrade --verbose mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh.git`
diff --git a/manifest.json b/manifest.json
index fa2886b..b096d4f 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": "1.3.3",
+ "version": "1.4.1",
"url": "https://github.com/tootsuite/mastodon",
"license": "AGPL v3.0",
"maintainer": {
diff --git a/scripts/install b/scripts/install
index 1634c52..e747241 100644
--- a/scripts/install
+++ b/scripts/install
@@ -99,7 +99,7 @@ url=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest |
version=$(echo $url | cut -d/ -f8)
sudo su - $app <<SWITCHCOMMANDS
pushd ~/live
-git checkout $version
+git checkout $(git tag | tail -n 1)
SWITCHCOMMANDS
# Be king rewind (/var/cache/yunohost/from_file/scripts)
diff --git a/scripts/upgrade b/scripts/upgrade
index 529c124..5be8dbe 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -54,7 +54,7 @@ url=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest |
version=$(echo $url | cut -d/ -f8)
sudo su - $app <<SWITCHCOMMANDS
pushd ~/live
-git checkout $version
+git checkout $(git tag | tail -n 1)
SWITCHCOMMANDS
# upgrade Node.js v4 to v6