From 5885b4cf7d8fcbd5d9019243235e9097c3fcac6b Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 20 Mar 2019 04:06:44 +0100
Subject: [PATCH] Fix ruby

---
 conf/mastodon-sidekiq.service |  2 +-
 conf/mastodon-web.service     |  2 +-
 scripts/install               | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service
index c799356..59f636f 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__/.rbenv/versions/2.6.0/bin/bundle exec sidekiq -c 20 -q default -q mailers -q pull -q push
+ ExecStart=/opt/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 dd6f6d7..32af850 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__/.rbenv/versions/2.6.0/bin/bundle exec puma -C config/puma.rb
+ ExecStart=/opt/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 819296b..abded5b 100644
--- a/scripts/install
+++ b/scripts/install
@@ -202,15 +202,15 @@ chown -R "$app": "$final_path"
 (
 	cd "$final_path/live"
 	su mastodon <<INSTALL
-		$final_path/.rbenv/versions/2.6.0/bin/gem update --system
-		$final_path/.rbenv/versions/2.6.0/bin/gem install bundler --no-document
-		$final_path/.rbenv/versions/2.6.0/bin/bundle install \
+		/opt/rbenv/versions/2.6.0/bin/gem update --system
+		/opt/rbenv/versions/2.6.0/bin/gem install bundler --no-document
+		/opt/rbenv/versions/2.6.0/bin/bundle install \
 		-j$(getconf _NPROCESSORS_ONLN) \
 		--deployment --without development test
 		yarn install --pure-lockfile
 		echo "SAFETY_ASSURED=1">> .env.production
-		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
+		RAILS_ENV=production /opt/rbenv/versions/2.6.0/bin/bundle exec rails db:migrate --quiet
+		RAILS_ENV=production /opt/rbenv/versions/2.6.0/bin/bundle exec rails assets:precompile --quiet
 INSTALL
 )