Revert "Pass require path to sub-process when running `bundle install`" (#8117)
* Revert "Pass require path to sub-process when running `bundle install` (#7618)" This reverts commit43b9f13b1a. * Revert "Update history to reflect merge of #7618 [ci skip]" This reverts commit2c605bfeb3.
This commit is contained in:
		
							parent
							
								
									657d924119
								
							
						
					
					
						commit
						4e25c36d86
					
				|  | @ -29,7 +29,6 @@ | |||
|   * Add PageDrop to provide Liquid templates with data (#7992) | ||||
|   * Optimize `Kramdown::JekyllDocument#to_html` calls (#8041) | ||||
|   * Reduce Jekyll::Renderer instances during a build (#7570) | ||||
|   * Pass require path to sub-process when running `bundle install` (#7618) | ||||
| 
 | ||||
| ### Documentation | ||||
| 
 | ||||
|  |  | |||
|  | @ -139,11 +139,9 @@ module Jekyll | |||
|         def after_install(path, options = {}) | ||||
|           unless options["blank"] || options["skip-bundle"] | ||||
|             begin | ||||
|               # Activate 'bundler' gem and puts it into the `loaded_specs`. | ||||
|               # For details: https://rubydocs.org/d/ruby-2-4-0/classes/Kernel.html#method-i-gem | ||||
|               gem "bundler" | ||||
|               require "bundler" | ||||
|               bundle_install path | ||||
|             rescue Gem::MissingSpecError | ||||
|             rescue LoadError | ||||
|               Jekyll.logger.info "Could not load Bundler. Bundle install skipped." | ||||
|             end | ||||
|           end | ||||
|  | @ -155,10 +153,8 @@ module Jekyll | |||
|         def bundle_install(path) | ||||
|           Jekyll.logger.info "Running bundle install in #{path.cyan}..." | ||||
|           Dir.chdir(path) do | ||||
|             bundler_gemspec = Gem.loaded_specs["bundler"] | ||||
|             exe = bundler_gemspec.bin_file "bundle" | ||||
|             require_paths = bundler_gemspec.full_require_paths | ||||
|             process, output = Jekyll::Utils::Exec.run("ruby", "-I", *require_paths, exe, "install") | ||||
|             exe = Gem.bin_path("bundler", "bundle") | ||||
|             process, output = Jekyll::Utils::Exec.run("ruby", exe, "install") | ||||
| 
 | ||||
|             output.to_s.each_line do |line| | ||||
|               Jekyll.logger.info("Bundler:".green, line.strip) unless line.to_s.empty? | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue