vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

doctor: detect more linux distro names

pull/6432/head
Delyan Angelov 2020-09-20 15:28:34 +03:00
parent fc1956573e
commit d7fee91655
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/tools/vdoctor.v
View File

@ -32,22 +32,23 @@ fn main(){
// //
mut os_details := '' mut os_details := ''
if os_kind == 'linux' { if os_kind == 'linux' {
if os.is_file('/usr/bin/lsb_release') { exists := cmd(command:'type lsb_release')
os_details = cmd(command: '/usr/bin/lsb_release -d -s') if !exists.starts_with('Error') {
os_details = cmd(command: 'lsb_release -d -s')
} else { } else {
ouname := os.uname() os_details = cmd(command: 'cat /proc/version')
os_details = '$ouname.release, $ouname.version'
} }
} } else if os_kind == 'mac' {
if os_kind == 'mac' {
mut details := []string mut details := []string
details << cmd(command: 'sw_vers -productName') details << cmd(command: 'sw_vers -productName')
details << cmd(command: 'sw_vers -productVersion') details << cmd(command: 'sw_vers -productVersion')
details << cmd(command: 'sw_vers -buildVersion') details << cmd(command: 'sw_vers -buildVersion')
os_details = details.join(', ') os_details = details.join(', ')
} } else if os_kind == 'windows' {
if os_kind == 'windows' {
os_details = cmd(command:'wmic os get name, buildnumber, osarchitecture', line: 1) os_details = cmd(command:'wmic os get name, buildnumber, osarchitecture', line: 1)
} else {
ouname := os.uname()
os_details = '$ouname.release, $ouname.version'
} }
line('OS', '$os_kind, $os_details') line('OS', '$os_kind, $os_details')
line('Processor', arch_details.join(', ')) line('Processor', arch_details.join(', '))
@ -81,8 +82,7 @@ fn cmd(c CmdConfig) string {
if x.exit_code == 0 { if x.exit_code == 0 {
return x.output.split_into_lines()[c.line] return x.output.split_into_lines()[c.line]
} }
println('cmd error: $x.output') return 'Error: $x.output'
return 'Error'
} }
fn line(label string, value string) { fn line(label string, value string) {