Merge pull request #9353 from maxim-belkin/config-no-codename

os/linux.rb: don't show codename when it's n/a
This commit is contained in:
Mike McQuaid 2020-12-02 12:49:53 +00:00 committed by GitHub
commit 68889b972c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -11,13 +11,14 @@ module OS
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.blank? || (codename == "n/a")
description
else
"#{description} (#{codename})"
end
elsif (redhat_release = Pathname.new("/etc/redhat-release")).readable?
redhat_release.read.chomp
else