aboutsummaryrefslogtreecommitdiff
path: root/scripts/upgrade
diff options
context:
space:
mode:
authornemsia <nemsia@nemsia.org>2017-04-28 18:05:07 +0200
committerGitHub <noreply@github.com>2017-04-28 18:05:07 +0200
commite245bb18e477317a4ac0b68fdb55f6eb29a119ae (patch)
treea97cd61daa27f26bb1fa6c69a50f8540870d73fa /scripts/upgrade
parent3a936561602b8ec357ce34cd4be0252ff4fef8bd (diff)
parentf79e0148cb4f388402a671f36087570ab0041b0d (diff)
downloadmastodon_ynh-e245bb18e477317a4ac0b68fdb55f6eb29a119ae.tar.gz
mastodon_ynh-e245bb18e477317a4ac0b68fdb55f6eb29a119ae.tar.bz2
mastodon_ynh-e245bb18e477317a4ac0b68fdb55f6eb29a119ae.zip
Merge branch 'master' into patch-1
Diffstat (limited to 'scripts/upgrade')
-rw-r--r--scripts/upgrade2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/upgrade b/scripts/upgrade
index 655f22f..076e3fb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -39,7 +39,7 @@ sudo systemctl stop mastodon-*.service
# Update Mastodon
sudo su - $app <<COMMANDS
-pushd ~/live
+cd live
git fetch
git pull https://github.com/tootsuite/mastodon.git master
git checkout $(git tag | tail -n 1)