Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix template with generator #1437

Merged
merged 2 commits into from
Dec 5, 2023
Merged

Fix template with generator #1437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d0d647
Wrap template generator code in an after_bundle block
marlo-longley Dec 5, 2023
d7bbeb6
Prefer with_unbundled_env to deprecated with_clean_env in generator
marlo-longley Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/generators/arclight/install_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions template.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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