admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

config: hide optional system packages.

Browse Source 
Java, XQuartz and the CLT separate header package aren't required for
everyone's Homebrew usage or a default macOS development install.

As a result, only show then in `brew config` when they are actually
installed.
This commit is contained in:
Mike McQuaid 2018-09-30 10:50:37 +01:00
parent b5bc65d535
commit 78ddc34847
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/extend/os/mac/system_config.rb
View File

@ -57,11 +57,9 @@ class SystemConfig
dump_generic_verbose_config(f) dump_generic_verbose_config(f)
f.puts "macOS: #{MacOS.full_version}-#{kernel}" f.puts "macOS: #{MacOS.full_version}-#{kernel}"
f.puts "CLT: #{clt || "N/A"}" f.puts "CLT: #{clt || "N/A"}"
if MacOS::CLT.separate_header_package?
f.puts "CLT headers: #{clt_headers || "N/A"}"
end
f.puts "Xcode: #{xcode || "N/A"}" f.puts "Xcode: #{xcode || "N/A"}"
f.puts "XQuartz: #{xquartz || "N/A"}" f.puts "CLT headers: #{clt_headers}" if MacOS::CLT.separate_header_package? && clt_headers
f.puts "XQuartz: #{xquartz}" if !MacOS::XQuartz.provided_by_apple? && xquartz
end end
end end
end end

2
Library/Homebrew/system_config.rb
View File

@ -196,7 +196,7 @@ class SystemConfig
end end
f.puts "Git: #{describe_git}" f.puts "Git: #{describe_git}"
f.puts "Curl: #{describe_curl}" f.puts "Curl: #{describe_curl}"
f.puts "Java: #{describe_java}" f.puts "Java: #{describe_java}" if describe_java != "N/A"
end end
alias dump_generic_verbose_config dump_verbose_config alias dump_generic_verbose_config dump_verbose_config
end end