diff options
| author | Markus Reiter | 2017-10-15 22:13:04 +0200 |
|---|---|---|
| committer | GitHub | 2017-10-15 22:13:04 +0200 |
| commit | b4e1e39d3b38b722fc554a3665d9b6dbf165d99a (patch) | |
| tree | 7ef1256f6edd85c4fd16263dc49f1616c52c99c3 | |
| parent | e1808bf0e35d522cda4ee4803f13746b604713f5 (diff) | |
| parent | 5b8a3d381b5fe3bcc0e55e49a7d3a875e264fc66 (diff) | |
| download | brew-b4e1e39d3b38b722fc554a3665d9b6dbf165d99a.tar.bz2 | |
Merge pull request #3296 from reitermarkus/refactor-languages
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 |