mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

doctor: detect more Linux distro names, using /etc/os-release first

Browse Source
This commit is contained in:
Delyan Angelov 2020-09-21 17:36:31 +03:00
parent 077b597bd8
commit 8c0b8c5ef7
1 changed files with 59 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
cmd/tools/vdoctor.v
View File

@ -32,14 +32,9 @@ fn main(){
//
mut os_details := ''
if os_kind == 'linux' {
exists := cmd(command:'type lsb_release')
if !exists.starts_with('Error') {
os_details = cmd(command: 'lsb_release -d -s')
} else {
os_details = cmd(command: 'cat /proc/version')
}
os_details = get_linux_os_name()
} else if os_kind == 'mac' {
mut details := []string
mut details := []string{}
details << cmd(command: 'sw_vers -productName')
details << cmd(command: 'sw_vers -productVersion')
details << cmd(command: 'sw_vers -buildVersion')
@ -63,6 +58,14 @@ fn main(){
is_writable_vroot := os.is_writable_folder(vroot) or { false }
line('is vroot writable', is_writable_vroot.str())
line('V full version', util.full_v_version(true))
vtmp := os.getenv('VTMP')
if vtmp != '' {
line('env VTMP', '"$vtmp"')
}
vflags := os.getenv('VFLAGS')
if vflags != '' {
line('env VFLAGS', '"$vflags"')
}
println(util.bold(term.h_divider('-')))
line('Git version', cmd(command:'git --version'))
line('Git vroot status', cmd(command:'git -C . describe --abbrev=8 --dirty --always --tags'))
@ -88,3 +91,52 @@ fn cmd(c CmdConfig) string {
fn line(label string, value string) {
println('$label: ${util.bold(value)}')
}
fn get_linux_os_name() string {
mut os_details := ''
linux_os_methods := ['os-release', 'lsb_release', 'kernel', 'uname']
for m in linux_os_methods {
match m {
'os-release' {
if !os.is_file('/etc/os-release') {
continue
}
lines := os.read_lines('/etc/os-release') or {
continue
}
mut vals := map[string]string
for line in lines {
x := line.split('=')
vals[x[0]] = x[1].trim('"')
}
if vals['PRETTY_NAME'] == '' {
continue
}
os_details = vals['PRETTY_NAME']
break
}
'lsb_release' {
exists := cmd(command:'type lsb_release')
if exists.starts_with('Error') {
continue
}
os_details = cmd(command: 'lsb_release -d -s')
break
}
'kernel' {
if !os.is_file('/proc/version') {
continue
}
os_details = cmd(command: 'cat /proc/version')
break
}
'uname' {
ouname := os.uname()
os_details = '$ouname.release, $ouname.version'
break
}
else {}
}
}
return os_details
}