aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cask/lib
diff options
context:
space:
mode:
authorMarkus Reiter2016-10-03 02:34:32 +0200
committerMarkus Reiter2016-10-03 02:57:29 +0200
commite2b3753fd91c47beeb3227a1c0df4c0dfa6026fc (patch)
tree6f3efd1eb351125333fbe10390bd3a9e5b7b87e0 /Library/Homebrew/cask/lib
parentef26bf188254671127f9c6b11e1c76585f136629 (diff)
downloadbrew-e2b3753fd91c47beeb3227a1c0df4c0dfa6026fc.tar.bz2
Style changes in `language_eval`.
Diffstat (limited to 'Library/Homebrew/cask/lib')
-rw-r--r--Library/Homebrew/cask/lib/hbc/dsl.rb15
1 files changed, 9 insertions, 6 deletions
diff --git a/Library/Homebrew/cask/lib/hbc/dsl.rb b/Library/Homebrew/cask/lib/hbc/dsl.rb
index a1129a21a..8e0a7715a 100644
--- a/Library/Homebrew/cask/lib/hbc/dsl.rb
+++ b/Library/Homebrew/cask/lib/hbc/dsl.rb
@@ -114,22 +114,25 @@ module Hbc
@language_blocks.default = block
else
language_eval
- @language
end
end
def language_eval
- return if instance_variable_defined?(:@language)
+ return @language if instance_variable_defined?(:@language)
- return unless instance_variable_defined?(:@language_blocks)
+ if @language_blocks.nil? || @language_blocks.empty?
+ return @language = nil
+ end
- MacOS.languages.map(&Locale.method(:parse)).any? { |locale|
+ MacOS.languages.map(&Locale.method(:parse)).each do |locale|
key = @language_blocks.keys.detect { |strings|
strings.any? { |string| locale.include?(string) }
}
- return @language = @language_blocks[key].call unless key.nil?
- }
+ next if key.nil?
+
+ return @language = @language_blocks[key].call
+ end
@language = @language_blocks.default.call
end