Don't break if bundler is not installed (#6377)
Merge pull request 6377
This commit is contained in:
parent
ca3a56b37c
commit
211a595329
|
@ -128,7 +128,12 @@ RUBY
|
||||||
|
|
||||||
def after_install(path, options = {})
|
def after_install(path, options = {})
|
||||||
unless options["blank"] || options["skip-bundle"]
|
unless options["blank"] || options["skip-bundle"]
|
||||||
|
begin
|
||||||
|
require "bundler"
|
||||||
bundle_install path
|
bundle_install path
|
||||||
|
rescue LoadError
|
||||||
|
Jekyll.logger.info "Could not load Bundler. Bundle install skipped."
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
Jekyll.logger.info "New jekyll site installed in #{path.cyan}."
|
Jekyll.logger.info "New jekyll site installed in #{path.cyan}."
|
||||||
|
@ -136,7 +141,6 @@ RUBY
|
||||||
end
|
end
|
||||||
|
|
||||||
def bundle_install(path)
|
def bundle_install(path)
|
||||||
Jekyll::External.require_with_graceful_fail "bundler"
|
|
||||||
Jekyll.logger.info "Running bundle install in #{path.cyan}..."
|
Jekyll.logger.info "Running bundle install in #{path.cyan}..."
|
||||||
Dir.chdir(path) do
|
Dir.chdir(path) do
|
||||||
process, output = Jekyll::Utils::Exec.run("bundle", "install")
|
process, output = Jekyll::Utils::Exec.run("bundle", "install")
|
||||||
|
|
Loading…
Reference in New Issue