admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Less code in begin/rescue block

Browse Source
This commit is contained in:
Jack Nagel 2015-06-21 21:18:23 -04:00
parent 1bba5fd88a
commit 2db59be452
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Library/Homebrew/extend/ENV/shared.rb
View File

@ -214,29 +214,30 @@ module SharedEnvExtension
begin
gcc_formula = gcc_version_formula(name)
if gcc_formula.name == "gcc"
return if gcc_formula.opt_prefix.exist?
raise <<-EOS.undent
The Homebrew GCC was not installed.
You must:
brew install gcc
EOS
end
if !gcc_formula.opt_prefix.exist?
raise <<-EOS.undent
The requested Homebrew GCC, #{gcc_version_name}, was not installed.
You must:
brew tap homebrew/versions
brew install #{gcc_version_name}
EOS
end
rescue FormulaUnavailableError
raise <<-EOS.undent
Homebrew GCC requested, but formula #{gcc_version_name} not found!
You may need to: brew tap homebrew/versions
EOS
end
if gcc_formula.name == "gcc"
return if gcc_formula.opt_prefix.exist?
raise <<-EOS.undent
The Homebrew GCC was not installed.
You must:
brew install gcc
EOS
end
if !gcc_formula.opt_prefix.exist?
raise <<-EOS.undent
The requested Homebrew GCC, #{gcc_version_name}, was not installed.
You must:
brew tap homebrew/versions
brew install #{gcc_version_name}
EOS
end
end
def permit_arch_flags; end