github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-03 03:09:17 +08:00
Code Projects Activity

Support wails doctor for Mac

Browse Source
This commit is contained in:
Lea Anthony 2020-12-30 00:18:59 +11:00
parent f77626490f
commit 02ef02ec9e
No known key found for this signature in database
GPG Key ID: 33DAF7BB90A58405
2 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
v2/internal/system/operatingsystem/os_darwin.go
View File

@ -1,6 +1,18 @@
package operatingsystem
import "github.com/wailsapp/wails/v2/internal/shell"
import (
"github.com/wailsapp/wails/v2/internal/shell"
"strings"
)
func getSysctlValue(key string) (string, error) {
stdout, _, err := shell.RunCommand(".", "sysctl", key)
if err != nil {
return "", err
}
version := strings.TrimPrefix(stdout, key+": ")
return strings.TrimSpace(version), nil
}
func platformInfo() (*OS, error) {
// Default value
@ -9,22 +21,28 @@ func platformInfo() (*OS, error) {
result.Name = "MacOS"
result.Version = "Unknown"
stdout, stderr, err := shell.RunCommand(".", "sysctl", "kern.osrelease")
println(stdout)
println(stderr)
println(err)
// cmd := CreateCommand(directory, command, args...)
// var stdo, stde bytes.Buffer
// cmd.Stdout = &stdo
// cmd.Stderr = &stde
// err := cmd.Run()
// return stdo.String(), stde.String(), err
// }
// sysctl := shell.NewCommand("sysctl")
// kern.ostype: Darwin
// kern.osrelease: 20.1.0
// kern.osrevision: 199506
version, err := getSysctlValue("kern.osproductversion")
if err != nil {
return nil, err
}
result.Version = version
ID, err := getSysctlValue("kern.osrevision")
if err != nil {
return nil, err
}
result.ID = ID
// cmd := CreateCommand(directory, command, args...)
// var stdo, stde bytes.Buffer
// cmd.Stdout = &stdo
// cmd.Stderr = &stde
// err := cmd.Run()
// return stdo.String(), stde.String(), err
// }
// sysctl := shell.NewCommand("sysctl")
// kern.ostype: Darwin
// kern.osrelease: 20.1.0
// kern.osrevision: 199506
return nil, nil
}
return &result, nil
}

9
v2/internal/system/system_darwin.go
View File

@ -2,7 +2,14 @@
package system
func (i *Info) discover() error {
import "github.com/wailsapp/wails/v2/internal/system/operatingsystem"
func (i *Info) discover() error {
var err error
osinfo, err := operatingsystem.Info()
if err != nil {
return err
}
i.OS = osinfo
return nil
}