Update install generators to explicitly run bundle install inside the…

… destination_root
projectblacklight · Apr 26, 2021 · b3831f8 · b3831f8
1 parent ba2649a
commit b3831f8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/lib/generators/blacklight/install_generator.rb b/lib/generators/blacklight/install_generator.rb
@@ -37,8 +37,10 @@ def copy_public_assets
     end
 
     def bundle_install
-      Bundler.with_clean_env do
-        run "bundle install"
+      inside destination_root do
+        Bundler.with_clean_env do
+          run "bundle install"
+        end
       end
     end
 
@@ -81,9 +83,7 @@ def generate_blacklight_marc_demo
       blacklight_marc = String.new('blacklight-marc')
       gem blacklight_marc, '>= 7.0.0.rc1', '< 8'
 
-      Bundler.with_clean_env do
-        run "bundle install"
-      end
+      bundle_install
 
       generate 'blacklight:marc:install'
     end

diff --git a/lib/generators/blacklight/solr_generator.rb b/lib/generators/blacklight/solr_generator.rb
@@ -35,8 +35,10 @@ def add_rsolr_gem
     end
 
     def bundle_install
-      Bundler.with_clean_env do
-        run "bundle install"
+      inside destination_root do
+        Bundler.with_clean_env do
+          run "bundle install"
+        end
       end
     end
   end

diff --git a/lib/generators/blacklight/user_generator.rb b/lib/generators/blacklight/user_generator.rb
@@ -24,8 +24,10 @@ def generate_devise_assets
       gem "devise"
       gem "devise-guests", "~> 0.6"
 
-      Bundler.with_clean_env do
-        run "bundle install"
+      inside destination_root do
+        Bundler.with_clean_env do
+          run "bundle install"
+        end
       end
 
       generate "devise:install"