From 6d0d647aa1f6cfd98e8a3d05d27ff158a854624e Mon Sep 17 00:00:00 2001 From: apple Date: Tue, 5 Dec 2023 12:08:26 -0500 Subject: [PATCH 1/2] Wrap template generator code in an after_bundle block Closes https://github.com/projectblacklight/arclight/issues/1436 --- template.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/template.rb b/template.rb index f9d5a92cf..d5aa2668a 100644 --- a/template.rb +++ b/template.rb @@ -2,9 +2,9 @@ gem 'arclight' -run 'bundle install' +after_bundle do + generate 'blacklight:install', '--devise' + generate 'arclight:install', '-f' -generate 'blacklight:install', '--devise' -generate 'arclight:install', '-f' - -rake 'db:migrate' + rake 'db:migrate' +end From d7bbeb6f827bb7eaeae804c36cba9a75e32431d6 Mon Sep 17 00:00:00 2001 From: apple Date: Tue, 5 Dec 2023 12:10:03 -0500 Subject: [PATCH 2/2] Prefer with_unbundled_env to deprecated with_clean_env in generator --- lib/generators/arclight/install_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/generators/arclight/install_generator.rb b/lib/generators/arclight/install_generator.rb index aa7b4dfce..3bacb7171 100644 --- a/lib/generators/arclight/install_generator.rb +++ b/lib/generators/arclight/install_generator.rb @@ -22,7 +22,7 @@ def include_arclight_solrdocument def install_blacklight_locale_picker gem 'blacklight-locale_picker' - Bundler.with_clean_env do + Bundler.with_unbundled_env do run 'bundle install' end