1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/mastodon_ynh.git synced 2024-09-03 19:46:02 +02:00

Merge remote-tracking branch 'refs/remotes/YunoHost-Apps/master' into fix-upgrade-1.4

This commit is contained in:
nemsia 2017-05-21 21:26:12 +02:00
commit 0b5660c081
2 changed files with 16 additions and 4 deletions

View file

@ -41,7 +41,7 @@ ynh_app_setting_set $app language $language
sudo adduser $app --home /opt/$app --gecos "First Last,RoomNumber,WorkPhone,HomePhone" --disabled-password --disabled-login
# Install debian package
ynh_package_install imagemagick libpq-dev libxml2-dev libxslt1-dev file curl apt-transport-https
ynh_package_install imagemagick libpq-dev libxml2-dev libxslt1-dev file curl apt-transport-https pkg-config libprotobuf-dev protobuf-compiler
# Install redis package
ynh_package_install redis-server redis-tools
@ -66,7 +66,7 @@ ynh_app_setting_set $app final_path $final_path
# Install de Node.js
pushd /opt
curl -sL https://deb.nodesource.com/setup_4.x | sudo bash -
curl -sL https://deb.nodesource.com/setup_6.x | sudo bash -
sudo apt-get -y install nodejs
# Install Yarn
@ -95,9 +95,11 @@ 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)
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)

View file

@ -40,6 +40,14 @@ sudo systemctl stop mastodon-*.service
# Change owner of live folder
sudo chown -R $app: $final_path/live
# upgrade Node.js v4 to v6
node_version=$(nodejs --version)
if [[ $node_version =~ ^v4.*$ ]]; then
pushd /opt
curl -sL https://deb.nodesource.com/setup_6.x | sudo bash -
sudo apt-get -y install nodejs
fi
# Download Mastodon
sudo su - $app <<PULLCOMMANDS
pushd ~/live
@ -50,9 +58,11 @@ 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)
sudo su - $app <<SWITCHCOMMANDS
pushd ~/live
git checkout $(git tag | tail -n 1)
git checkout $version
SWITCHCOMMANDS
# upgrade Node.js v4 to v6