diff options
| author | nemsia <nemsia@nemsia.org> | 2017-05-12 22:55:44 +0200 |
|---|---|---|
| committer | nemsia <nemsia@nemsia.org> | 2017-05-12 22:55:44 +0200 |
| commit | dc0d11084c85d5251474f5a971b16760b857d6a3 (patch) | |
| tree | da135824fcfcf41bf1a396d88ca31f175ae5d638 | |
| parent | 4ab87b703b324c09882a6a01d785310eebf33fc8 (diff) | |
| parent | e6a5b2bc5e08f68d13c5293a9812f3deddb4ce60 (diff) | |
| download | mastodon_ynh-dc0d11084c85d5251474f5a971b16760b857d6a3.tar.gz mastodon_ynh-dc0d11084c85d5251474f5a971b16760b857d6a3.tar.bz2 mastodon_ynh-dc0d11084c85d5251474f5a971b16760b857d6a3.zip | |
Merge remote-tracking branch 'refs/remotes/YunoHost-Apps/master'
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | scripts/install | 7 | ||||
| -rw-r--r-- | scripts/upgrade | 5 |
3 files changed, 10 insertions, 4 deletions
@@ -90,5 +90,5 @@ It seems important to close the inscriptions for your Mastodon, so that it remai - [x] Fix restore - [x] Install from a release - [x] Tune [Create automatic user](https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Administration-guide.md#creating-users-while-registration-is-closed) -- [ ] Change SMTP settings +- [x] Change SMTP settings - [ ] Fix errors on jenkins diff --git a/scripts/install b/scripts/install index 39cbaa5..0c71505 100644 --- a/scripts/install +++ b/scripts/install @@ -93,9 +93,12 @@ git clone https://github.com/rbenv/ruby-build.git $final_path/.rbenv/plugins/rub git clone https://github.com/tootsuite/mastodon.git $final_path/live CLONECOMMANDS -# Switch to tagged release +# Switch branch to tagged release cd $final_path/live -sudo git checkout $(git tag | tail -n 1) +sudo su - $app <<SWITCHCOMMANDS +pushd ~/live +git checkout $(git tag | tail -n 1) +SWITCHCOMMANDS # Be king rewind (/var/cache/yunohost/from_file/scripts) popd diff --git a/scripts/upgrade b/scripts/upgrade index ea548b9..f070bbd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -50,7 +50,10 @@ PULLCOMMANDS # Switch branch to tagged release cd $final_path/live -sudo git checkout $(git tag | tail -n 1) +sudo su - $app <<SWITCHCOMMANDS +pushd ~/live +git checkout $(git tag | tail -n 1) +SWITCHCOMMANDS # Apply Mastodon upgrade sudo su - $app <<COMMANDS |