Merge pull request #5508 from MikeMcQuaid/utils-bundler-executable

utils: don't look for bundler executable.
This commit is contained in:
Mike McQuaid 2019-01-08 20:48:48 +00:00 committed by GitHub
commit 8acb183456
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -240,19 +240,19 @@ module Homebrew
odie "Failed to install/update the '#{name}' gem." if exit_code.nonzero? odie "Failed to install/update the '#{name}' gem." if exit_code.nonzero?
end end
def install_gem_setup_path!(name) def install_gem_setup_path!(name, executable: name)
install_gem!(name) install_gem!(name)
return if which(name) return if which(executable)
odie <<~EOS odie <<~EOS
The '#{name}' gem is installed but couldn't find '#{name}' in the PATH: The '#{name}' gem is installed but couldn't find '#{executable}' in the PATH:
#{ENV["PATH"]} #{ENV["PATH"]}
EOS EOS
end end
def install_bundler! def install_bundler!
install_gem_setup_path! "bundler" install_gem_setup_path! "bundler", executable: "bundle"
end end
def install_bundler_gems! def install_bundler_gems!