From 4ec52f841d1658129a35d20c20dd52745ced8ae9 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Fri, 26 May 2017 23:48:33 +0200
Subject: [PATCH] Merge remote-tracking branch
 'refs/remotes/YunoHost-Apps/master' into nginx-conf

# Conflicts:
#	scripts/restore
---
 scripts/restore | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/scripts/restore b/scripts/restore
index 4ac7f93..7ea4d9e 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -117,21 +117,23 @@ sudo su -c "psql" postgres <<< \
 sudo su -c "psql" postgres <<< \
 			"update pg_database set datistemplate='true' where datname='template1';"
 
+# Install rbenv
+sudo su - $app <<COMMANDS
+pushd ~/.rbenv
+src/configure && make -C src
+echo 'export PATH="/opt/mastodon/.rbenv/bin:/opt/mastodon/live/bin:$PATH"' >> ~/.profile
+echo 'export PATH="/opt/mastodon/.rbenv/bin:/opt/mastodon/live/bin:$PATH"' >> ~/.bashrc
+echo 'eval "\$(rbenv init -)"' >> ~/.profile
+COMMANDS
+
 # Create user for db postgresql
 ynh_psql_create_db_without_password "$app"
 
 # Setup database
-sudo su - $app <<SCOMMANDS
-cd ~/live
-RAILS_ENV=production bin/bundle exec rails db:setup
-SCOMMANDS
-
-# Restore Mastodon
-sudo su - $app <<RCOMMANDS
-cd ~/live
-RAILS_ENV=production bin/bundle exec rails db:migrate
-RAILS_ENV=production bin/bundle exec rails assets:precompile
-RCOMMANDS
+#sudo su - $app <<SCOMMANDS
+#cd ~/live
+#RAILS_ENV=production bin/bundle exec rails db:setup
+#SCOMMANDS
 
 # copy database dump
 sudo cp $YNH_APP_BACKUP_DIR/mastodon_db.sql $final_path
@@ -150,6 +152,16 @@ ynh_secure_remove $final_path/mastodon_db.sql
 # Create symlink for ruby
 sudo ln -s /opt/mastodon/.rbenv/versions/2.4.1/bin/ruby /usr/bin/ruby || true
 
+# Upgrade Mastodon
+sudo su - $app <<RCOMMANDS
+cd ~/live
+bin/bundle install
+yarn install --pure-lockfile
+#RAILS_ENV=production bin/bundle exec rails db:migrate
+#RAILS_ENV=production bundle exec rails assets:clean
+#RAILS_ENV=production bin/bundle exec rails assets:precompile
+RCOMMANDS
+
 # Modify Nginx configuration file and copy it to Nginx conf directory
 sudo sed -i "s@__PATH__@$app@g" ./nginx.conf
 sudo sed -i "s@__FINALPATH__@$final_path/@g" ./nginx.conf