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

Merge pull request #3516 from sjackman/system-config-version

Browse Source 
config: Print the linked_version [Linux]
This commit is contained in:
Mike McQuaid 2017-12-03 09:19:22 +00:00 committed by GitHub
commit d0e893fab6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/extend/os/linux/system_config.rb
View File

@ -20,11 +20,9 @@ class SystemConfig
`#{gcc} --version 2>/dev/null`[/ (\d+\.\d+\.\d+)/, 1] `#{gcc} --version 2>/dev/null`[/ (\d+\.\d+\.\d+)/, 1]
end end
def formula_version(formula) def formula_linked_version(formula)
return "N/A" unless CoreTap.instance.installed? return "N/A" unless CoreTap.instance.installed?
f = Formulary.factory formula Formulary.factory(formula).linked_version || "N/A"
return "N/A" unless f.installed?
f.version
rescue FormulaUnavailableError rescue FormulaUnavailableError
return "N/A" return "N/A"
end end
@ -35,7 +33,7 @@ class SystemConfig
out.puts "OS: #{host_os_version}" out.puts "OS: #{host_os_version}"
out.puts "/usr/bin/gcc: #{host_gcc_version}" out.puts "/usr/bin/gcc: #{host_gcc_version}"
["glibc", "gcc", "xorg"].each do |f| ["glibc", "gcc", "xorg"].each do |f|
out.puts "#{f}: #{formula_version f}" out.puts "#{f}: #{formula_linked_version f}"
end end
end end
end end