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

This commit is contained in:
Maxim Belkin 2020-11-30 14:41:02 -06:00
parent 1d5e354cc2
commit 4d672d1759

View File

@ -11,13 +11,14 @@ module OS
sig { returns(String) } sig { returns(String) }
def os_version def os_version
if which("lsb_release") if which("lsb_release")
description = Utils.popen_read("lsb_release -d") lsb_info = Utils.popen_read("lsb_release -a")
.chomp description = lsb_info[/^Description:\s*(.*)$/, 1]
.sub("Description:\t", "") codename = lsb_info[/^Codename:\s*(.*)$/, 1]
codename = Utils.popen_read("lsb_release -c") if codename == "n/a"
.chomp description
.sub("Codename:\t", "") else
"#{description} (#{codename})" "#{description} (#{codename})"
end
elsif (redhat_release = Pathname.new("/etc/redhat-release")).readable? elsif (redhat_release = Pathname.new("/etc/redhat-release")).readable?
redhat_release.read.chomp redhat_release.read.chomp
else else