From dd867100d01ac9afee2b6922eab2cc5253aeab93 Mon Sep 17 00:00:00 2001
From: anmol <github@datamol.org>
Date: Tue, 22 Jan 2019 12:13:13 +0530
Subject: [PATCH] Use of rbenv 2.6.0

---
 conf/mastodon-sidekiq.service |  2 +-
 conf/mastodon-web.service     |  2 +-
 scripts/install               | 13 +++++++------
 scripts/upgrade               |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service
index f788332..c799356 100644
--- a/conf/mastodon-sidekiq.service
+++ b/conf/mastodon-sidekiq.service
@@ -8,7 +8,7 @@
  WorkingDirectory=__FINALPATH__/live
  Environment="RAILS_ENV=production"
  Environment="DB_POOL=20"
- ExecStart=__FINALPATH__/live/bin/bundle exec sidekiq -c 20 -q default -q mailers -q pull -q push
+ ExecStart=__FINALPATH__/.rbenv/versions/2.6.0/bin/bundle exec sidekiq -c 20 -q default -q mailers -q pull -q push
  TimeoutSec=15
  Restart=always
  StandardError=syslog
diff --git a/conf/mastodon-web.service b/conf/mastodon-web.service
index 46b304e..dd6f6d7 100644
--- a/conf/mastodon-web.service
+++ b/conf/mastodon-web.service
@@ -8,7 +8,7 @@
  WorkingDirectory=__FINALPATH__/live
  Environment="RAILS_ENV=production"
  Environment="PORT=__PORT_WEB__"
- ExecStart=__FINALPATH__/live/bin/bundle exec puma -C config/puma.rb
+ ExecStart=__FINALPATH__/.rbenv/versions/2.6.0/bin/bundle exec puma -C config/puma.rb
  TimeoutSec=15
  Restart=always
  StandardError=syslog
diff --git a/scripts/install b/scripts/install
index 42d046a..54635e9 100644
--- a/scripts/install
+++ b/scripts/install
@@ -207,13 +207,14 @@ chown -R "$app": "$final_path"
 	cd "$final_path/live"
 	su mastodon <<INSTALL
 		$final_path/.rbenv/versions/2.6.0/bin/gem install bundler:1.16.6 --no-ri --no-rdoc
-		$final_path/live/bin/bundle install \
+		$final_path/.rbenv/versions/2.6.0/bin/gem install bundler
+		$final_path/.rbenv/versions/2.6.0/bin/bundle install bundler \
 		-j$(getconf _NPROCESSORS_ONLN) \
 		--deployment --without development test
 		yarn install --pure-lockfile
 		echo "SAFETY_ASSURED=1">> .env.production
-		RAILS_ENV=production $final_path/live/bin/bundle exec rails db:migrate --quiet
-		RAILS_ENV=production $final_path/live/bin/bundle exec rails assets:precompile --quiet
+		RAILS_ENV=production $final_path/.rbenv/versions/2.6.0/bin/bundle exec rails db:migrate --quiet
+		RAILS_ENV=production $final_path/.rbenv/versions/2.6.0/bin/bundle exec rails assets:precompile --quiet
 INSTALL
 )
 
@@ -234,13 +235,13 @@ systemctl start "$app-web.service" "$app-sidekiq.service" "$app-streaming.servic
 (
 	cd "$final_path/live"
 	su mastodon <<CREATEUSER
-RAILS_ENV=production bin/bundle exec rails c
+RAILS_ENV=production $final_path/.rbenv/versions/2.6.0/bin/bundle exec rails c
 account = Account.create!(username: '$admin_mastodon')
 user = User.create!(email: '$admin_mastodon_mail', password: '$admin_pass', account: account)
 CREATEUSER
 	su mastodon <<SETADMIN
-RAILS_ENV=production bin/tootctl accounts modify $admin_mastodon --confirm
-RAILS_ENV=production bin/tootctl accounts modify $admin_mastodon --role admin
+RAILS_ENV=production $final_path/.rbenv/versions/2.6.0/bin/tootctl accounts modify $admin_mastodon --confirm
+RAILS_ENV=production $final_path/.rbenv/versions/2.6.0/bin/tootctl accounts modify $admin_mastodon --role admin
 SETADMIN
 )
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 3c0405c..85fb1f4 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -142,7 +142,7 @@ ynh_setup_source "$final_path/.rbenv/plugins/ruby-build" "app-ruby-build"
 
 chown -R "$app": "$final_path"
 
-# Install ruby 2.5.1
+# Install ruby 2.6.0
 (
 	exec_as "$app" $final_path/.rbenv/bin/rbenv install -s 2.6.0 || true
 	exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.6.0 || true