mirror of
https://github.com/clockworkpi/LauncherGoDev.git
synced 2026-03-19 02:12:46 +01:00
replace wlan0 to sysgo.WifiDev
move execCmd to UI.ExecCmd add read app-local.ini in config.go for dev/ run launcher out of GameShell
This commit is contained in:
@@ -364,10 +364,8 @@ func (self *MainScreen) IsWifiConnectedNow() bool {
|
||||
func (self *MainScreen) GetWirelessIP() string {
|
||||
|
||||
cli := fmt.Sprintf( "ip -4 addr show %s | grep -oP '(?<=inet\\s)\\d+(\\.\\d+){3}'",sysgo.WifiDev)
|
||||
out := System(cli)
|
||||
if len(out) > 5 {
|
||||
out = strings.TrimSuffix(out,"\n")
|
||||
}
|
||||
out := SystemTrim(cli)
|
||||
|
||||
|
||||
return out
|
||||
}
|
||||
|
||||
@@ -286,3 +286,17 @@ func SystemTrim(cmd string) string {
|
||||
|
||||
return strings.Trim(ret,"\r\n")
|
||||
}
|
||||
|
||||
func cmdEnv() []string {
|
||||
return []string{"LANG=C", "LC_ALL=C"}
|
||||
}
|
||||
|
||||
func ExecCmd(cmdArgs []string) ([]byte, error) {
|
||||
cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...)
|
||||
cmd.Env = append(os.Environ(), cmdEnv()...)
|
||||
out, err := cmd.Output()
|
||||
if err != nil {
|
||||
err = fmt.Errorf(`failed to execute "%v" (%+v)`, strings.Join(cmdArgs, " "), err)
|
||||
}
|
||||
return out, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user