cuu hace 5 años
padre
commit
02786260f5
Se han modificado 4 ficheros con 10 adiciones y 7 borrados
  1. 4 2
      Menu/GameShell/10_Settings/Update/update_page.go
  2. 4 4
      main.go
  3. 1 1
      sysgo/config.go
  4. 1 0
      update.sh

+ 4 - 2
Menu/GameShell/10_Settings/Update/update_page.go

@@ -52,8 +52,10 @@ func (self *UpdateConfirmPage) KeyDown(ev *event.Event) {
 	}
   
   if ev.Data["Key"] == UI.CurKeys["B"] {
+    fmt.Println("Update Confirm Page B",self.GIT)
     if self.GIT == true {
-      cmdpath := fmt.Sprintf("update.sh %s ",self.Version)
+      //go exec requires FullPath of script filename 
+      cmdpath := fmt.Sprintf("%s/update.sh %s",UI.GetExePath(),self.Version)
       event.Post(UI.RUNSH,cmdpath)
       return
     }
@@ -229,7 +231,7 @@ func (self *UpdatePage) KeyDown(ev *event.Event) {
   }
   
   if ev.Data["Key"] == UI.CurKeys["X"] {
-    if self.Screen.DBusManager.IsWifiConnectedNow() == true {
+    if self.Screen.DBusManager.IsWifiConnectedNow() == false {
       if self.CheckUpdate() == true {
         self.Screen.Draw()
         self.Screen.SwapAndShow()

+ 4 - 4
main.go

@@ -262,8 +262,8 @@ func run() int {
 	UI.SwapAndShow()
 	
 	//fmt.Println(main_screen)
-    
-	event.AddCustomEvent(UI.RUNEVT)
+  event.AllocEvents(3)
+  event.AddCustomEvent(UI.RUNEVT)
   event.AddCustomEvent(UI.RUNSH)
   
   go FlashLed1(main_screen)
@@ -307,9 +307,9 @@ func run() int {
           gogame.Quit()          
           
           fmt.Println("RUNSH")
-          exec_app_cmd := ev.Data["Msg"]
+          exec_app_cmd := ev.Data["Msg"]+";"
           fmt.Println(exec_app_cmd)
-          cmd := exec.Command("/bin/sh",exec_app_cmd)
+          cmd := exec.Command("/bin/sh","-c",exec_app_cmd)
           err := cmd.Start()
           if err != nil {
             fmt.Println(err)

+ 1 - 1
sysgo/config.go

@@ -9,7 +9,7 @@ type PowerLevel struct {
 var PowerLevels map[string]*PowerLevel
 
 var (
-	CurKeySet = "GameShell" // PC or GameShell
+	CurKeySet = "PC" // PC or GameShell
 	DontLeave = false
 	BackLight = "/proc/driver/backlight"
 	Battery   = "/sys/class/power_supply/axp20x-battery/uevent"

+ 1 - 0
update.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+sleep 10
 feh --bg-center /home/cpi/launchergo/sysgo/gameshell/wallpaper/updating.png
 cd /home/cpi/launchergo 
 git pull