Combine conditional branches that do the same thing

This commit is contained in:
Jack Nagel 2014-04-05 17:41:37 -05:00
parent 2b8f1ca94b
commit aa556177f7

View File

@ -176,11 +176,9 @@ class Formulary
# name appears to be a tapped formula, so we don't munge it # name appears to be a tapped formula, so we don't munge it
# in order to provide a useful error message when require fails. # in order to provide a useful error message when require fails.
f = TapLoader.new(name_or_path) f = TapLoader.new(name_or_path)
elsif name_or_path.include? "/" elsif name_or_path.include?("/") || File.extname(name_or_path) == ".rb"
# If name was a path or mapped to a cached formula # If name was a path or mapped to a cached formula
f = FromPathLoader.new(name_or_path) f = FromPathLoader.new(name_or_path)
elsif File.extname(name_or_path) == ".rb"
f = FromPathLoader.new(name_or_path)
else else
f = StandardLoader.new(name_or_path) f = StandardLoader.new(name_or_path)
end end