OrgGo/shirou_gopsutil
1
0
Fork 0
mirror of https://github.com/shirou/gopsutil.git synced 2025-04-26 13:48:59 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #256 from shirou/change-platform-version-on-darwin

Browse Source 
[host]darwin: change to use sw_vers to get platform version
This commit is contained in:
shirou 2016-09-13 00:34:47 +09:00 committed by GitHub
commit 214acac9ea
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
host/host_darwin.go
View File

@ -32,11 +32,11 @@ func Info() (*InfoStat, error) {
ret.Hostname = hostname
}
platform, family, version, err := PlatformInformation()
platform, family, pver, version, err := PlatformInformation()
if err == nil {
ret.Platform = platform
ret.PlatformFamily = family
ret.PlatformVersion = version
ret.PlatformVersion = pver
ret.KernelVersion = version
}
@ -135,26 +135,37 @@ func Users() ([]UserStat, error) {
}
func PlatformInformation() (string, string, string, error) {
func PlatformInformation() (string, string, string, string, error) {
platform := ""
family := ""
version := ""
pver := ""
sw_vers, err := exec.LookPath("sw_vers")
if err != nil {
return "", "", "", "", err
}
uname, err := exec.LookPath("uname")
if err != nil {
return "", "", "", err
return "", "", "", "", err
}
out, err := invoke.Command(uname, "-s")
if err == nil {
platform = strings.ToLower(strings.TrimSpace(string(out)))
}
out, err = invoke.Command(sw_vers, "-productVersion")
if err == nil {
pver = strings.ToLower(strings.TrimSpace(string(out)))
}
out, err = invoke.Command(uname, "-r")
if err == nil {
version = strings.ToLower(strings.TrimSpace(string(out)))
}
return platform, family, version, nil
return platform, family, pver, version, nil
}
func Virtualization() (string, string, error) {