diff options
| author | Markus Reiter | 2017-10-07 16:27:29 +0200 |
|---|---|---|
| committer | Markus Reiter | 2017-10-10 17:11:22 +0200 |
| commit | 5b8a3d381b5fe3bcc0e55e49a7d3a875e264fc66 (patch) | |
| tree | e3883c94c1c9a1b4c275a3629d7729e879fff5e7 | |
| parent | 56458f03fcc68ef6d8ee3ee4a7c1d16021aa5800 (diff) | |
| download | brew-5b8a3d381b5fe3bcc0e55e49a7d3a875e264fc66.tar.bz2 | |
Refactor `MacOS::languages`.
| -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 |