taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #124 from XanthusL/master

Browse Source 
Update system_info.go
This commit is contained in:
Chris Cummer 2018-06-01 22:55:42 -07:00 committed by GitHub
commit a1bc7cfd6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
system/system_info.go
View File

@ -28,7 +28,7 @@ func NewSystemInfo() *SystemInfo {
default: default:
cmd = exec.Command("sw_vers", arg...) cmd = exec.Command("sw_vers", arg...)
} }
raw := wtf.ExecuteCommand(cmd) raw := wtf.ExecuteCommand(cmd)
for _, row := range strings.Split(raw, "\n") { for _, row := range strings.Split(raw, "\n") {
@ -41,11 +41,27 @@ func NewSystemInfo() *SystemInfo {
m[strings.TrimSpace(parts[0])] = strings.TrimSpace(parts[1]) m[strings.TrimSpace(parts[0])] = strings.TrimSpace(parts[1])
} }
sysInfo := SystemInfo{ var sysInfo *SystemInfo
ProductName: m["ProductName"], switch runtime.GOOS {
ProductVersion: m["ProductVersion"], case "linux":
BuildVersion: m["BuildVersion"], sysInfo = &SystemInfo{
} ProductName: m["Distributor ID"],
ProductVersion: m["Description"],
BuildVersion: m["Release"],
}
case "darwin":
sysInfo = &SystemInfo{
ProductName: m["ProductName"],
ProductVersion: m["ProductVersion"],
BuildVersion: m["BuildVersion"],
}
default:
sysInfo = &SystemInfo{
ProductName: m["ProductName"],
ProductVersion: m["ProductVersion"],
BuildVersion: m["BuildVersion"],
}
return &sysInfo }
return sysInfo
} }