From 5ce2a24649e12a087ce2a424d418262b1425ffb5 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sat, 6 Mar 2021 01:10:38 +0100
Subject: ynh_ruby_3

---
 scripts/install | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'scripts/install')

diff --git a/scripts/install b/scripts/install
index 7d21d45..204bb52 100644
--- a/scripts/install
+++ b/scripts/install
@@ -75,9 +75,10 @@ ynh_app_setting_set --app=$app --key=port_stream --value=$port_stream
 #=================================================
 ynh_script_progression --message="Installing dependencies..."
 
-ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 ynh_install_app_dependencies $pkg_dependencies	
 ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
+ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
+ynh_install_ruby --ruby_version=$RUBY_VERSION
 
 #=================================================
 # CREATE A POSTGRESQL DATABASE
@@ -142,10 +143,10 @@ ynh_add_swap --size=$swap_needed
 #=================================================
 ynh_script_progression --message="Installing Ruby..."
 
-ynh_install_ruby --ruby_version=$RUBY_VERSION
 pushd "$final_path/live"
-	$RBENV_ROOT/versions/$app/bin/gem update --system
-	$RBENV_ROOT/versions/$app/bin/gem install bundler:$BUNDLER_VERSION --no-document
+	ynh_use_ruby
+	$ynh_gem update --system
+	$ynh_gem install bundler:$BUNDLER_VERSION --no-document
 popd
 
 #=================================================
@@ -181,17 +182,17 @@ ynh_script_progression --message="Installing Mastodon..."
 chown -R "$app": "$final_path"
 
 pushd "$final_path/live"
+	sudo -u $app $ynh_ruby_load_path $ruby_path/bundle config deployment 'true'
+	sudo -u $app $ynh_ruby_load_path $ruby_path/bundle config without 'development test'
+	sudo -u $app $ynh_ruby_load_path $ruby_path/bundle install -j$(getconf _NPROCESSORS_ONLN)
 	ynh_use_nodejs
-	sudo -u $app PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle config deployment 'true'
-	sudo -u $app PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle config without 'development test'
-	sudo -u $app PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
-	sudo -u $app PATH=$PATH yarn install --pure-lockfile
+	sudo -u $app $ynh_node_load_PATH yarn install --pure-lockfile
 	echo "SAFETY_ASSURED=1">> $config
-	sudo -u $app RAILS_ENV=production PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle exec rails db:setup --quiet
-	sudo -u $app RAILS_ENV=production PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle exec rails assets:precompile --quiet
-	sudo -u $app RAILS_ENV=production PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt
-	sudo -u $app RAILS_ENV=production PATH=$PATH bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=admin > /dev/null
-	sudo -u $app RAILS_ENV=production PATH=$PATH bin/tootctl accounts modify "$admin" --approve
+	sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails db:setup --quiet
+	sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails assets:precompile --quiet
+	sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt
+	sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=admin > /dev/null
+	sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/tootctl accounts modify "$admin" --approve
 popd
 
 vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "$final_path/live/key.txt")
-- 
cgit v1.2.3-70-g09d2