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

sysgo/UI/main_screen.go

@@ -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	
 }

sysgo/UI/util_funcs.go

@@ -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
+}

sysgo/config.go

@@ -1,5 +1,12 @@
 package sysgo
 
+import (
+	"fmt"
+	"os"
+	"github.com/go-ini/ini"
+	
+)
+
 type PowerLevel struct {
   Dim int
   Close  int
@@ -9,8 +16,8 @@ type PowerLevel struct {
 var PowerLevels map[string]*PowerLevel
 
 var (
-  CurKeySet = "PC" // PC or GameShell
-  //CurKeySet = "GameShell"
+  //CurKeySet = "PC" // PC or GameShell
+  CurKeySet = "GameShell"
   DontLeave = false
   BackLight = "/proc/driver/backlight"
   Battery   = "/sys/class/power_supply/axp20x-battery/uevent"
@@ -25,10 +32,8 @@ var (
   //load from dot files   
   CurPowerLevel= "performance"
   Lang        = "English"
-  //WifiDev     = "wlan0"
-	WifiDev     = "wlp5s0"
-
-  
+  WifiDev     = "wlan0"
+	
 )
 
 
@@ -40,4 +45,37 @@ func init() {
     PowerLevels["server"]      = &PowerLevel{40, 120, 0  }
     PowerLevels["performance"] = &PowerLevel{40, 0,   0  }
   }
+
+	//sudo LauncherGoDev=1 ./launchergo # for develop code on PC
+	dev_mode := os.Getenv("LauncherGoDev")
+	
+	if len(dev_mode) < 1 {
+		return
+	}
+	
+	if _, err := os.Stat("app-local.ini" ); err == nil {
+		load_opts := ini.LoadOptions{
+			IgnoreInlineComment:true,
+		}
+		cfg, err := ini.LoadSources(load_opts, "app-local.ini" )
+		if err != nil {
+			fmt.Printf("Fail to read file: %v\n", err)
+			return
+		}
+		section := cfg.Section("GameShell")
+		if section != nil {
+			gs_opts := section.KeyStrings()
+			for i,v := range gs_opts {
+				fmt.Println(i,v, section.Key(v).String())
+				switch v{
+					case "WifiDev":
+					WifiDev = section.Key(v).String()
+					case "CurKeySet":
+					CurKeySet = section.Key(v).String()
+					
+				}
+			}
+		}
+	}
+	
 }