From 47769f98f10c80d259bdc9651c50f1f92fb7790a Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Fri, 13 Sep 2019 16:48:12 +0100
Subject: [PATCH] os/linux: add, use OS::Linux.os_version

Similar to MacOS.version. A bit cleaner for us here but also plan on
using this in Homebrew/homebrew-bundle.
---
 .../Homebrew/extend/os/linux/system_config.rb | 14 +------------
 Library/Homebrew/os/linux.rb                  | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Library/Homebrew/extend/os/linux/system_config.rb b/Library/Homebrew/extend/os/linux/system_config.rb
index bae9ad3e4e..93e87d3119 100644
--- a/Library/Homebrew/extend/os/linux/system_config.rb
+++ b/Library/Homebrew/extend/os/linux/system_config.rb
@@ -5,18 +5,6 @@ require "os/linux/glibc"
 
 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?
@@ -42,7 +30,7 @@ class SystemConfig
     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|
diff --git a/Library/Homebrew/os/linux.rb b/Library/Homebrew/os/linux.rb
index cc26893e79..10c5094b5e 100644
--- a/Library/Homebrew/os/linux.rb
+++ b/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