diff options
| author | Gautham Goli | 2017-10-21 01:39:04 +0530 |
|---|---|---|
| committer | Gautham Goli | 2017-10-21 01:48:00 +0530 |
| commit | bdc7eba4b3459ea0f6fefb5a829da649134d7f8d (patch) | |
| tree | f95203c5920ac4210033c77ce5d64cac39da0732 /Library/Homebrew/os | |
| parent | 7fa51f71f1a8a21b905bafc1fb4106f0222d654f (diff) | |
| parent | c4e8c7906d12399b34188cd3395b8f9d30dc89b3 (diff) | |
| download | brew-bdc7eba4b3459ea0f6fefb5a829da649134d7f8d.tar.bz2 | |
Merge branch 'master' into audit_line_rubocop_part_4_rebase_attempt_1
Diffstat (limited to 'Library/Homebrew/os')
| -rw-r--r-- | Library/Homebrew/os/mac.rb | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb index 853f75140..9dbb252e4 100644 --- a/Library/Homebrew/os/mac.rb +++ b/Library/Homebrew/os/mac.rb @@ -47,19 +47,11 @@ module OS end def languages - return @languages unless @languages.nil? - - @languages = Utils.popen_read("defaults", "read", ".GlobalPreferences", "AppleLanguages").scan(/[^ \n"(),]+/) - - if ENV["HOMEBREW_LANGUAGES"] - @languages = ENV["HOMEBREW_LANGUAGES"].split(",") + @languages - end - - if ARGV.value("language") - @languages = ARGV.value("language").split(",") + @languages - end - - @languages = @languages.uniq + @languages ||= [ + *ARGV.value("language")&.split(","), + *ENV["HOMEBREW_LANGUAGES"]&.split(","), + *Open3.capture2("defaults", "read", "-g", "AppleLanguages")[0].scan(/[^ \n"(),]+/), + ].uniq end def language |