From 5a0082a5f7796fc4ac1a1a2bba9a24a0e42fe0f0 Mon Sep 17 00:00:00 2001
From: Mateusz <2871798+orhtej2@users.noreply.github.com>
Date: Tue, 2 Apr 2024 18:54:37 +0200
Subject: [PATCH] Add `env`

---
 scripts/install | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/scripts/install b/scripts/install
index f2457f0..909c0de 100644
--- a/scripts/install
+++ b/scripts/install
@@ -122,23 +122,24 @@ pushd "$install_dir/live"
 	ynh_use_ruby
 	ynh_gem update --system
 	ynh_gem install bundler --no-document
-	ynh_exec_as "$app" "$ynh_ruby_load_path" "$ld_preload" bin/bundle config deployment 'true'
-	ynh_exec_as "$app" "$ynh_ruby_load_path" "$ld_preload" bin/bundle config without 'development test'
-	ynh_exec_as "$app" "$ynh_ruby_load_path" "$ld_preload" bin/bundle config set force_ruby_platform true
-	ynh_exec_as "$app" "$ynh_ruby_load_path" "$ld_preload" bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
+	ynh_exec_as "$app" env $ynh_ruby_load_path $ld_preload bin/bundle config deployment 'true'
+	ynh_exec_as "$app" env $ynh_ruby_load_path $ld_preload bin/bundle config without 'development test'
+	ynh_exec_as "$app" env $ynh_ruby_load_path $ld_preload bin/bundle config set force_ruby_platform true
+	ynh_exec_as "$app" env $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
 
 	# Building assets
 	ynh_use_nodejs
 	env $ynh_node_load_PATH corepack enable
 	ynh_exec_warn_less ynh_exec_as "$app" env $ynh_node_load_PATH corepack enable
+	ynh_exec_warn_less ynh_exec_as "$app" env $ynh_node_load_PATH corepack prepare --activate
 	ynh_exec_warn_less ynh_exec_as "$app" env $ynh_node_load_PATH yarn install
 	echo "SAFETY_ASSURED=1">> "$config"
-	ynh_exec_warn_less ynh_exec_as "$app" RAILS_ENV=production "$ynh_ruby_load_path" "$ld_preload" bin/bundle exec rails db:migrate --quiet
-	ynh_exec_warn_less ynh_exec_as "$app" RAILS_ENV=production "$ynh_ruby_load_path" "$ld_preload" bin/bundle exec rails assets:precompile --quiet
+	ynh_exec_warn_less ynh_exec_as "$app" env RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate --quiet
+	ynh_exec_warn_less ynh_exec_as "$app" env RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:precompile --quiet
 	# Generate vapid keys
-	ynh_exec_warn_less ynh_exec_as "$app" RAILS_ENV=production "$ynh_ruby_load_path" "$ld_preload" bin/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt
+	ynh_exec_warn_less ynh_exec_as "$app" env RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt
 	# Create the first admin user
-	ynh_exec_warn_less ynh_exec_as "$app" RAILS_ENV=production "$ynh_ruby_load_path" "$ld_preload" bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=Owner > /dev/null
+	ynh_exec_warn_less ynh_exec_as "$app" env RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=Owner > /dev/null
 popd
 
 # Re-generate config with vapid keys