admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

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

Browse Source 
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
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/os/linux.rb
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.blank? || (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