From 77ce9e8ad40d8edfb1273f78f9084b6d95c45e22 Mon Sep 17 00:00:00 2001 From: Belac Darkstorm Date: Thu, 22 Sep 2016 00:25:58 -0500 Subject: [PATCH] appinfo.ini detection no longer capitalization dependent --- setup.go | 16 +++++++++++----- ui.go | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/setup.go b/setup.go index 9b1b983..c50242c 100644 --- a/setup.go +++ b/setup.go @@ -159,11 +159,17 @@ func getIcon(fold string) gxui.Texture { } func findInfo(fold string) *os.File { - if fi, err := os.Open(fold + "/App/AppInfo/appinfo.ini"); err == nil { - return fi - } else if fi, err := os.Open(fold + "/App/AppInfo/AppInfo.ini"); err == nil { - return fi - } else if fi, err := os.Open(fold + "/appinfo.ini"); err == nil { + tmp, err := os.Open(fold + "/App/AppInfo") + if err == nil { + fis, _ := tmp.Readdirnames(-1) + for _, v := range fis { + if strings.ToLower(v) == "appinfo.ini" { + tmp, _ := os.Open(fold + "/App/AppInfo/" + v) + return tmp + } + } + } + if fi, err := os.Open(fold + "/appinfo.ini"); err == nil { return fi } return nil diff --git a/ui.go b/ui.go index 59bdaa6..10cad10 100644 --- a/ui.go +++ b/ui.go @@ -10,7 +10,7 @@ func ui() { catListAdap := &StrList{} appListAdap := &catAdap{} catListAdap.SetStrings(lin) - win := th.CreateWindow(600, 500, "LinuxPA") + win := th.CreateWindow(500, 500, "LinuxPA") top := th.CreateLinearLayout() top.SetDirection(gxui.BottomToTop) splBox := th.CreateLinearLayout()