Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

os/linux: add, use OS::Linux.os_version #6443

Merged
merged 1 commit into from Sep 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 1 addition & 13 deletions Library/Homebrew/extend/os/linux/system_config.rb
Expand Up @@ -5,18 +5,6 @@

class SystemConfig
class << self
def host_os_version
if which("lsb_release")
description = `lsb_release -d`.chomp.sub("Description:\t", "")
codename = `lsb_release -c`.chomp.sub("Codename:\t", "")
"#{description} (#{codename})"
elsif (redhat_release = Pathname.new("/etc/redhat-release")).readable?
redhat_release.read.chomp
else
"N/A"
end
end

def host_glibc_version
version = OS::Linux::Glibc.system_version
return "N/A" if version.null?
Expand All @@ -42,7 +30,7 @@ def formula_linked_version(formula)
def dump_verbose_config(out = $stdout)
dump_generic_verbose_config(out)
out.puts "Kernel: #{`uname -mors`.chomp}"
out.puts "OS: #{host_os_version}"
out.puts "OS: #{OS::Linux.os_version}"
out.puts "Host glibc: #{host_glibc_version}"
out.puts "/usr/bin/gcc: #{host_gcc_version}"
["glibc", "gcc", "xorg"].each do |f|
Expand Down
20 changes: 20 additions & 0 deletions Library/Homebrew/os/linux.rb
@@ -1,6 +1,26 @@
# frozen_string_literal: true

module OS
module Linux
module_function

def os_version
if which("lsb_release")
description = Utils.popen_read("lsb_release -d")
.chomp
.sub("Description:\t", "")
codename = Utils.popen_read("lsb_release -c")
.chomp
.sub("Codename:\t", "")
"#{description} (#{codename})"
elsif (redhat_release = Pathname.new("/etc/redhat-release")).readable?
redhat_release.read.chomp
else
"Unknown"
end
end
end

# Define OS::Mac on Linux for formula API compatibility.
module Mac
module_function
Expand Down