os/linux.rb: don't show codename when it's n/a

Homebrew · Dec 1, 2020 · 4d672d1 · 4d672d1
1 parent 1d5e354
commit 4d672d1
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/Library/Homebrew/os/linux.rb b/Library/Homebrew/os/linux.rb
@@ -11,13 +11,14 @@ module Linux
     sig { returns(String) }
     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})"
+        lsb_info = Utils.popen_read("lsb_release -a")
+        description = lsb_info[/^Description:\s*(.*)$/, 1]
+        codename = lsb_info[/^Codename:\s*(.*)$/, 1]
+        if codename == "n/a"
+          description
+        else
+          "#{description} (#{codename})"
+        end
       elsif (redhat_release = Pathname.new("/etc/redhat-release")).readable?
         redhat_release.read.chomp
       else