Messing arround with gioui

Basic app directory parsing and executable detection

.gitignore

@@ -0,0 +1 @@
+/testing

README.md

@@ -1,40 +1,51 @@
 # LinuxPA
+
 LinuxPA is a try to bring a [PortableApps.com](http://portableapps.com) type launcher to Linux.  
 
-# How to use
+## How to use
+
 Just double click on an app to launch it! If there are multiple executables, you can either select the specific executable, or if you just double click the app it'll launch the first linux executable it finds. .sh script files have priority over other executable files.
 
-# Apps:
+## Apps
+
 The below place provides linux executables that don't need libs installed on the host system:  
 [https://appimage.github.io/](https://appimage.github.io/)  
 
-# PortableApps.com Compatibility
+## PortableApps.com Compatibility
+
 LinuxPA works will with the PortableApps.com launcher, as it looks for apps in the PortableApps folder and grabs the app's name and icon from where it should be in the PortableApps.com format.  
 My forum at PortableApps.com can be found [here](http://portableapps.com/node/54998).  
 
-# common.sh
+## common.sh
-common.sh is found in the PortableApps/LinuxPACom folder and is executed before the app. I mainly use it to set environment variables (such as HOME). You can create and edit the common.sh from settings  
+
+common.sh is found in the PortableApps/LinuxPACom folder and is executed before the app. I mainly use it to set environment variables (such as HOME). You can create and edit the common.sh from settings.
+
+## Simple App Setup
 
-# Simple App Setup
 Because apps aren't natively formated in the PortableApps.com format, LinuxPA will look in the root directory for a AppInfo.ini (for basic info such as category and name) and appicon.png. If they aren't found, it looks where the appicon_\*.png and AppInfo.ini is in PortableApps format. You can set what the AppInfo.ini and appicon.png are from LinuxPA.  
 
-# AppImage Support
+## AppImage Support
+
 [AppImage Website](http://appimage.org)
 I'm looking into improving AppImage support. As of 2.1.5.0 IF `unsquashfs` is in $PATH then some advanced AppImage support is available and it will automagically get the name and possibly the icon of it. I'm looking into better support, but it might be a while.
 
-# USB mount
+## USB mount
+
 Unfortunately Linux, by default, doesn't support running executables off of FAT formated flash drives, requiring you to mount your drive with special mount arguments or format in a linux friendly format (such as EXT4). I personally use the arguments `exec,noauto,nodev,nosuid,umask=0000`  
 
-# Screenshots
+## Screenshots
+
 Photos are found [Here](https://goo.gl/photos/VtBUL6DyZTMidj5n6). The screenshots are with the adapta gtk theme
 
-# TODO (Might be in order)
+## TODO (Might be in order)
-1. MAKE IT BETTER  
+
+1. MAKE IT BETTER
+1. Integrate [goappimage](https://github.com/probonod/go-appimage) library for better AppImage integration.
 1. Try to `chmod +x` executables if they don't have the permission
-1. Manual update check   
+1. Manual update check
-1. Better AppImage integrations (Specifically updating, getting information from the appimage, and better appimage downloading)
+1. Better AppImage integrations (Specifically updating and better appimage downloading)
-1. Automagic appimage updating (It will of course ask you beforehand)
 1. Get information (such as name and icon) directly from an appimage
 1. Better appimage downloading (probably based around [AppImageHub](https://appimage.github.io/apps/))
 1. Sandboxing support
+   1. Might be possible by packaging as an AppImage and providing Firejail, or simply just downloading it (like with Wine)
 1. Check if all apps are closed when it closes and ask if you want to force stop the apps

app.go

@@ -1,319 +1,113 @@
 package main
 
 import (
-	"bufio"
+	"bytes"
-	"fmt"
+	"log"
 	"os"
-	"os/exec"
+	"path/filepath"
+	"slices"
 	"strings"
 
-	"github.com/gotk3/gotk3/gdk"
+	"github.com/probonopd/go-appimage/src/goappimage"
-	"github.com/gotk3/gotk3/gtk"
 )
 
-type app struct {
+type ExeType byte
-	name   string
+
-	cat    string
+const (
-	appimg []string
+	Script = ExeType(iota + 1)
-	lin    []string
+	AppImage
-	ex     []string
+	ELF
-	icon   *gdk.Pixbuf
+	Win
-	dir    string
+)
-	ini    *os.File
+
-	wine   bool
+type Exe struct {
+	Filename string
+	Type     ExeType
 }
 
-func (a *app) getTreeIter(store *gtk.TreeStore) *gtk.TreeIter {
+type App struct {
-	it := store.Append(nil)
+	Name  string
-	scaled, _ := a.icon.ScaleSimple(32, 32, gdk.INTERP_HYPER)
+	Execs []Exe
-	store.SetValue(it, 0, scaled)
+	// Image []byte TODO
-	if portableHide {
-		store.SetValue(it, 1, strings.TrimSuffix(a.name, "Portable"))
-	} else {
-		store.SetValue(it, 1, a.name)
-	}
-	if len(a.ex) > 1 {
-		if wine {
-			for _, v := range a.ex {
-				i := store.Append(it)
-				store.SetValue(i, 1, v)
-			}
-		} else {
-			for _, v := range a.lin {
-				i := store.Append(it)
-				store.SetValue(i, 1, v)
-			}
-		}
-	}
-	return it
 }
 
-func (a *app) launch() {
+func ProcessAppImage(fil string) (*App, error) {
-	if len(a.ex) == 1 {
+	ai, err := goappimage.NewAppImage(fil)
-		if wine {
-			var cmd *exec.Cmd
-			if !contains(a.lin, a.ex[0]) {
-				if comEnbld {
-					cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[0]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; wine \""+a.ex[0]+"\"")
-				} else {
-					cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; wine \""+a.ex[0]+"\"")
-				}
-			} else {
-				if paDirs && strings.HasSuffix(strings.ToLower(a.ex[0]), ".appimage") {
-					os.Mkdir(a.dir+"/"+a.ex[0]+".home", 0777)
-					os.Mkdir(a.dir+"/"+a.ex[0]+".config", 0777)
-				}
-				if comEnbld {
-					cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[0]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[0]+"\"")
-				} else {
-					cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.ex[0]+"\"")
-				}
-			}
-			cmd.Stdout = os.Stdout
-			cmd.Stderr = os.Stderr
-			cmd.Start()
-		} else {
-			var cmd *exec.Cmd
-			if paDirs && strings.HasSuffix(strings.ToLower(a.ex[0]), ".appimage") {
-				os.Mkdir(a.dir+"/"+a.ex[0]+".home", 0777)
-				os.Mkdir(a.dir+"/"+a.ex[0]+".config", 0777)
-			}
-			if comEnbld {
-				cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[0]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[0]+"\"")
-			} else {
-				cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.ex[0]+"\"")
-			}
-			cmd.Stdout = os.Stdout
-			cmd.Stderr = os.Stderr
-			cmd.Start()
-		}
-	} else {
-		if wine {
-			var cmd *exec.Cmd
-			if len(a.lin) == 0 {
-				if comEnbld {
-					cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[0]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; wine \""+a.ex[0]+"\"")
-				} else {
-					cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; wine \""+a.ex[0]+"\"")
-				}
-			} else {
-				var ind int
-				for i, v := range a.lin {
-					if strings.HasSuffix(v, ".sh") {
-						ind = i
-						break
-					}
-				}
-				if paDirs && strings.HasSuffix(strings.ToLower(a.ex[ind]), ".appimage") {
-					os.Mkdir(a.dir+"/"+a.ex[ind]+".home", 0777)
-					os.Mkdir(a.dir+"/"+a.ex[ind]+".config", 0777)
-				}
-				if comEnbld {
-					cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[ind]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.lin[ind]+"\"")
-				} else {
-					cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.lin[ind]+"\"")
-				}
-			}
-			cmd.Stdout = os.Stdout
-			cmd.Stderr = os.Stderr
-			cmd.Start()
-		} else {
-			if len(a.lin) != 0 {
-				var ind int
-				for i, v := range a.lin {
-					if strings.HasSuffix(v, ".sh") {
-						ind = i
-						break
-					}
-				}
-				var cmd *exec.Cmd
-				if paDirs && strings.HasSuffix(strings.ToLower(a.ex[ind]), ".appimage") {
-					os.Mkdir(a.dir+"/"+a.ex[ind]+".home", 0777)
-					os.Mkdir(a.dir+"/"+a.ex[ind]+".config", 0777)
-				}
-				if comEnbld {
-					cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[ind]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.lin[ind]+"\"")
-				} else {
-					cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.lin[ind]+"\"")
-				}
-				cmd.Stdout = os.Stdout
-				cmd.Stderr = os.Stderr
-				cmd.Start()
-			}
-		}
-	}
-}
-
-func (a *app) launchSub(sub int) {
-	if wine {
-		var cmd *exec.Cmd
-		if !contains(a.lin, a.ex[sub]) {
-			if comEnbld {
-				cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[0]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; wine \""+a.ex[sub]+"\"")
-			} else {
-				cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; wine \""+a.ex[sub]+"\"")
-			}
-		} else {
-			if paDirs && strings.HasSuffix(strings.ToLower(a.ex[sub]), ".appimage") {
-				os.Mkdir(a.dir+"/"+a.ex[sub]+".home", 0777)
-				os.Mkdir(a.dir+"/"+a.ex[sub]+".config", 0777)
-			}
-			if comEnbld {
-				cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[sub]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
-			} else {
-				cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
-			}
-		}
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		cmd.Start()
-	} else {
-		var cmd *exec.Cmd
-		if paDirs && strings.HasSuffix(strings.ToLower(a.ex[sub]), ".appimage") {
-			os.Mkdir(a.dir+"/"+a.ex[sub]+".home", 0777)
-			os.Mkdir(a.dir+"/"+a.ex[sub]+".config", 0777)
-		}
-		if comEnbld {
-			cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[sub]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
-		} else {
-			cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
-		}
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		cmd.Start()
-	}
-}
-
-func (a *app) edit(parent *gtk.Window, reload func()) {
-	tmp := *a
-	parent.SetSensitive(false)
-	win, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
-	win.Connect("destroy", func() {
-		master = make(map[string][]app)
-		linmaster = make(map[string][]app)
-		cats = make([]string, 0)
-		lin = make([]string, 0)
-		setup()
-		reload()
-		parent.SetSensitive(true)
-	})
-	win.SetDefaultSize(400, 135)
-	topLvl, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-	topLvl.SetMarginStart(10)
-	topLvl.SetMarginEnd(10)
-	topLvl.SetMarginTop(10)
-	topLvl.SetMarginBottom(10)
-	top, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
-	img, _ := gtk.ImageNewFromPixbuf(a.icon)
-	imgBut, _ := gtk.ButtonNew()
-	imgBut.SetImage(img)
-	imgBut.SetSizeRequest(100, 100)
-	imgBut.Connect("clicked", func() {
-		fil, _ := gtk.FileChooserDialogNewWith1Button("Select Icon", win, gtk.FILE_CHOOSER_ACTION_OPEN, "Open", gtk.RESPONSE_ACCEPT)
-		filter, _ := gtk.FileFilterNew()
-		filter.AddPixbufFormats()
-		filter.SetName("Supported Pictures")
-		fil.AddFilter(filter)
-		but, _ := fil.AddButton("Cancel", gtk.RESPONSE_CANCEL)
-		but.Connect("clicked", func() {
-			fil.Close()
-		})
-		resp := fil.Run()
-		if resp == gtk.RESPONSE_ACCEPT {
-			filename := fil.GetFilename()
-			_, err := os.Open(filename)
 	if err != nil {
-				fmt.Println(err)
+		return nil, err
-				return
 	}
-			pix, _ := gdk.PixbufNewFromFileAtSize(filename, 32, 32)
+	app := App{
-			tmp.icon = pix
+		Name: ai.Name,
-			img.SetFromPixbuf(pix)
+		// Image: ,
-			fil.Close()
+		Execs: []Exe{
+			{
+				Filename: fil,
+				Type:     AppImage,
+			},
+		},
 	}
-	})
+	return &app, nil
-	topRt, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-	nameLbl, _ := gtk.LabelNew("Name:")
-	nameLbl.SetHAlign(gtk.ALIGN_START)
-	txtgtbl, _ := gtk.TextTagTableNew()
-	txtBuf, _ := gtk.TextBufferNew(txtgtbl)
-	nameTxt, _ := gtk.TextViewNewWithBuffer(txtBuf)
-	nameTxt.SetAcceptsTab(false)
-	nameTxt.SetWrapMode(gtk.WRAP_CHAR)
-	nameTxt.SetPixelsBelowLines(5)
-	nameTxt.SetHExpand(true)
-	nameTxt.SetVExpand(false)
-	nameTxt.SetBorderWindowSize(gtk.TEXT_WINDOW_BOTTOM, 5)
-	nameShow := tmp.name
-	if tmp.wine {
-		nameShow = strings.TrimSuffix(nameShow, " (Wine)")
-	}
-	txtBuf.SetText(nameShow)
-	vScrollName, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	hScrollName, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	nameScr, _ := gtk.ScrolledWindowNew(hScrollName, vScrollName)
-	nameScr.SetPolicy(gtk.POLICY_AUTOMATIC, gtk.POLICY_NEVER)
-	nameScr.SetSizeRequest(300, 25)
-	nameScr.SetVExpand(false)
-	nameScr.Add(nameTxt)
-	catLbl, _ := gtk.LabelNew("Category:")
-	catLbl.SetHAlign(gtk.ALIGN_START)
-	catTbl, _ := gtk.TextTagTableNew()
-	catBuf, _ := gtk.TextBufferNew(catTbl)
-	catTxt, _ := gtk.TextViewNewWithBuffer(catBuf)
-	catBuf.SetText(tmp.cat)
-	catTxt.SetAcceptsTab(false)
-	catTxt.SetWrapMode(gtk.WRAP_CHAR)
-	catTxt.SetPixelsBelowLines(5)
-	catTxt.SetHExpand(true)
-	catTxt.SetVExpand(false)
-	catTxt.SetBorderWindowSize(gtk.TEXT_WINDOW_BOTTOM, 5)
-	vScrollCat, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	hScrollCat, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	catScr, _ := gtk.ScrolledWindowNew(hScrollCat, vScrollCat)
-	catScr.SetPolicy(gtk.POLICY_AUTOMATIC, gtk.POLICY_NEVER)
-	catScr.SetSizeRequest(300, 25)
-	catScr.SetVExpand(false)
-	catScr.Add(catTxt)
-	topRt.Add(nameLbl)
-	topRt.Add(nameScr)
-	topRt.Add(catLbl)
-	topRt.Add(catScr)
-	top.Add(imgBut)
-	top.Add(topRt)
-	bot, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
-	sv, _ := gtk.ButtonNewWithLabel("Save")
-	sv.Connect("clicked", func() {
-		tmp.name, _ = txtBuf.GetText(txtBuf.GetStartIter(), txtBuf.GetEndIter(), true)
-		tmp.cat, _ = catBuf.GetText(catBuf.GetStartIter(), catBuf.GetEndIter(), true)
-		tmp.makeIni()
-		os.Remove(a.dir + "/appicon.png")
-		tmp.icon.SavePNG(a.dir+"/appicon.png", 0)
-		win.Close()
-	})
-	cnl, _ := gtk.ButtonNewWithLabel("Cancel")
-	cnl.Connect("clicked", func() {
-		win.Close()
-	})
-	bot.PackEnd(sv, false, false, 0)
-	bot.PackEnd(cnl, false, false, 0)
-	topLvl.Add(top)
-	topLvl.Add(bot)
-	win.Add(topLvl)
-	win.ShowAll()
-	win.Show()
 }
 
-func (a *app) makeIni() {
+func ProcessDir(dir string) (*App, error) {
-	os.Remove(a.dir + "/appinfo.ini")
+	fils, err := os.ReadDir(dir)
-	fil, err := os.Create(a.dir + "/appinfo.ini")
 	if err != nil {
-		return
+		log.Printf("Unable to list files in %v: %v\n", dir, err)
+		return nil, err
 	}
-	ini := "[General]\n"
+	app := App{
-	ini += "Category=" + a.cat + "\n"
+		Name: filepath.Base(dir),
-	ini += "Name=" + a.name + "\n"
+	}
-	wrt := bufio.NewWriter(fil)
+	for _, f := range fils {
-	wrt.WriteString(ini)
+		if f.IsDir() {
-	wrt.Flush()
+			continue
+		}
+		var t ExeType
+		if strings.HasSuffix(strings.ToLower(f.Name()), ".exe") {
+			t = Win
+		} else {
+			fil, err := os.Open(filepath.Join(dir, f.Name()))
+			if err != nil {
+				log.Printf("Error opening %v: %v\n", filepath.Join(dir, f.Name()), err)
+				continue
+			}
+			startByts := make([]byte, 4)
+			_, err = fil.Read(startByts)
+			if err != nil {
+				log.Printf("Error reading starting bytes of %v: %v\n", filepath.Join(dir, f.Name()), err)
+				continue
+			}
+			if bytes.HasPrefix(startByts, []byte("#!")) {
+				t = Script
+			} else if bytes.Contains(bytes.ToLower(startByts), []byte("elf")) {
+				if strings.HasSuffix(strings.ToLower(f.Name()), ".so") || strings.Contains(strings.ToLower(f.Name()), ".so.") {
+					continue
+				}
+				if goappimage.IsAppImage(filepath.Join(dir, f.Name())) {
+					t = AppImage
+				} else {
+					t = ELF
+				}
+			}
+		}
+		if t != 0 {
+			app.Execs = append(app.Execs, Exe{
+				Filename: f.Name(),
+				Type:     t,
+			})
+		}
+	}
+	if len(app.Execs) == 0 {
+		return nil, nil
+	}
+	slices.SortFunc(app.Execs, func(a, b Exe) int {
+		if a.Type > b.Type {
+			return 1
+		} else if a.Type < b.Type {
+			return -1
+		}
+		return strings.Compare(a.Filename, b.Filename)
+	})
+	//TODO: get "proper" name & icon, either from AppImage or PortableApps spec
+	return &app, nil
 }

go.mod

@@ -1,13 +1,44 @@
 module github.com/CalebQ42/LinuxPA
 
-go 1.15
+go 1.23.1
+
+require github.com/probonopd/go-appimage v0.0.0-20240922191415-5cf876da9cdc
 
 require (
-	github.com/CalebQ42/GoAppImage v0.4.0
+	gioui.org v0.7.1 // indirect
-	github.com/gotk3/gotk3 v0.5.0
+	gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 // indirect
-	github.com/mholt/archiver/v3 v3.5.0
+	gioui.org/shader v1.0.8 // indirect
-	github.com/pkg/browser v0.0.0-20201112035734-206646e67786
+	github.com/CalebQ42/squashfs v1.0.2 // indirect
+	github.com/adrg/xdg v0.5.0 // indirect
+	github.com/alokmenghrajani/gpgeez v0.0.0-20161206084504-1a06f1c582f9 // indirect
+	github.com/eclipse/paho.mqtt.golang v1.5.0 // indirect
+	github.com/emirpasic/gods v1.12.0 // indirect
+	github.com/go-text/typesetting v0.1.1 // indirect
+	github.com/google/go-github v17.0.0+incompatible // indirect
+	github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/pierrec/lz4/v4 v4.1.21 // indirect
+	github.com/rasky/go-lzo v0.0.0-20200203143853-96a758eda86e // indirect
+	github.com/sergi/go-diff v1.0.0 // indirect
+	github.com/src-d/gcfg v1.4.0 // indirect
+	github.com/therootcompany/xz v1.0.1 // indirect
+	github.com/ulikunitz/xz v0.5.12 // indirect
+	github.com/xanzy/ssh-agent v0.2.1 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
+	golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
+	golang.org/x/exp/shiny v0.0.0-20240707233637-46b078467d37 // indirect
+	golang.org/x/image v0.18.0 // indirect
+	golang.org/x/net v0.27.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
+	gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
-
-//For testing local changes to my library
-// replace github.com/CalebQ42/GoAppImage => ../GoAppImage

go.sum

@@ -1,71 +1,130 @@
-github.com/CalebQ42/GoAppImage v0.4.0 h1:aF+Y/vyo/RGhoyZEW1CMY6WyRWrZZO4ydsRFAtIGnaY=
+gioui.org v0.7.1 h1:l7OVj47n1z8acaszQ6Wlu+Rxme+HqF3q8b+Fs68+x3w=
-github.com/CalebQ42/GoAppImage v0.4.0/go.mod h1:qHudJKAn/dlkNWNnH4h1YKXp29EZ7Bppsn7sNP2HuvU=
+gioui.org v0.7.1/go.mod h1:5Kw/q7R1BWc5MKStuTNvhCgSrRqbfHc9Dzfjs4IGgZo=
-github.com/adrg/xdg v0.2.2 h1:A7ZHKRz5KGOLJX/bg7IPzStryhvCzAE1wX+KWawPiAo=
+gioui.org/cpu v0.0.0-20210808092351-bfe733dd3334/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
-github.com/adrg/xdg v0.2.2/go.mod h1:7I2hH/IT30IsupOpKZ5ue7/qNi3CoKzD6tL3HwpaRMQ=
+gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 h1:AGDDxsJE1RpcXTAxPG2B4jrwVUJGFDjINIPi1jtO6pc=
-github.com/andybalholm/brotli v1.0.0 h1:7UCwP93aiSfvWpapti8g88vVVGp2qqtGyePsSuDafo4=
+gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
-github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
+gioui.org/shader v1.0.8 h1:6ks0o/A+b0ne7RzEqRZK5f4Gboz2CfG+mVliciy6+qA=
+gioui.org/shader v1.0.8/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM=
+github.com/CalebQ42/squashfs v1.0.2 h1:r1OMSTpacV4GXOWaLwnydEpcrv+yhUSIzrvSGYO74Xg=
+github.com/CalebQ42/squashfs v1.0.2/go.mod h1:uhKIQfq2+dgJ+utqCkvVk0t7XuqaNhcotCrqSI0wUuI=
+github.com/adrg/xdg v0.5.0 h1:dDaZvhMXatArP1NPHhnfaQUqWBLBsmx1h1HXQdMoFCY=
+github.com/adrg/xdg v0.5.0/go.mod h1:dDdY4M4DF9Rjy4kHPeNL+ilVF+p2lK8IdM9/rTSGcI4=
+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
+github.com/alokmenghrajani/gpgeez v0.0.0-20161206084504-1a06f1c582f9 h1:Zio/mdDEpJDG1yeH9y2Kcb9ATWXkE7WIBkO+IMqRbbM=
+github.com/alokmenghrajani/gpgeez v0.0.0-20161206084504-1a06f1c582f9/go.mod h1:u65XFfs2+s//7QVkp5Q1NEZl4zVep2BtubxiSXJERN8=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
+github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dsnet/compress v0.0.1 h1:PlZu0n3Tuv04TzpfPbrnI0HW/YwodEXDS+oPKahKF0Q=
+github.com/eclipse/paho.mqtt.golang v1.5.0 h1:EH+bUVJNgttidWFkLLVKaQPGmkTUfQQqjOsyvMGvD6o=
-github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo=
+github.com/eclipse/paho.mqtt.golang v1.5.0/go.mod h1:du/2qNQVqJf/Sqs4MEL77kR8QTqANF7XU7Fk0aOTAgk=
-github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
+github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
-github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
+github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
-github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
+github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
+github.com/go-text/typesetting v0.1.1 h1:bGAesCuo85nXnEN5LmFMVGAGpGkCPtHrZLi//qD7EJo=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/go-text/typesetting v0.1.1/go.mod h1:d22AnmeKq/on0HNv73UFriMKc4Ez6EqZAofLhAzpSzI=
-github.com/gotk3/gotk3 v0.5.0 h1:GOkq4cFgAfeK6YAukLi64bz8zPayZKeCSSRr4mcFReQ=
+github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
-github.com/gotk3/gotk3 v0.5.0/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
-github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 h1:zLTLjkaOFEFIOxY5BWLFLwh+cL8vOBW4XJ2aqLE/Tf0=
-github.com/klauspost/compress v1.10.10 h1:a/y8CglcM7gLGYmlbP/stPE5sR3hbhFRUjCBfd/0B3I=
+github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
-github.com/klauspost/compress v1.10.10/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
-github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/klauspost/pgzip v1.2.4 h1:TQ7CNpYKovDOmqzRHKxJh0BeaBI7UdQZYc6p7pMQh1A=
+github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
-github.com/klauspost/pgzip v1.2.4/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
+github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY=
+github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/mholt/archiver/v3 v3.5.0 h1:nE8gZIrw66cu4osS/U7UW7YDuGMHssxKutU8IfWxwWE=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
-github.com/mholt/archiver/v3 v3.5.0/go.mod h1:qqTTPUK/HZPFgFQ/TJ3BzvTpF/dPtFVJXdQbCmeMxwc=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
-github.com/nwaples/rardecode v1.1.0 h1:vSxaY8vQhOcVr4mm5e8XllHWTiM4JF507A0Katqw7MQ=
+github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pierrec/lz4/v4 v4.0.3 h1:vNQKSVZNYUEAvRY9FaUXAF1XPbSOHJtDTiP41kzDz2E=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pierrec/lz4/v4 v4.0.3/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pkg/browser v0.0.0-20201112035734-206646e67786 h1:4Gk0Dsp90g2YwfsxDOjvkEIgKGh+2R9FlvormRycveA=
-github.com/pkg/browser v0.0.0-20201112035734-206646e67786/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
+github.com/probonopd/go-appimage v0.0.0-20240922191415-5cf876da9cdc h1:m+G8q9mghEL9nU4sbdHBP0uFWe7/0k3IqeRIn5TrPnU=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/probonopd/go-appimage v0.0.0-20240922191415-5cf876da9cdc/go.mod h1:WIMiirlWSahyTIR4hOMWhMojo2Xxqtk/bi/YSNyWYDg=
-github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
+github.com/rasky/go-lzo v0.0.0-20200203143853-96a758eda86e h1:dCWirM5F3wMY+cmRda/B1BiPsFtmzXqV9b0hLWtVBMs=
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/rasky/go-lzo v0.0.0-20200203143853-96a758eda86e/go.mod h1:9leZcVcItj6m9/CfHY5Em/iBrCz7js8LcRQGTKEEv2M=
+github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
+github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/ulikunitz/xz v0.5.7 h1:YvTNdFzX6+W5m9msiYg/zpkSURPPtOlzbqYjrFn7Yt4=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw=
-github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
+github.com/therootcompany/xz v1.0.1/go.mod h1:3K3UH1yCKgBneZYhuQUvJ9HPD19UEXEI0BWbMn8qNMY=
-github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
+github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
-go.lsp.dev/uri v0.3.0 h1:KcZJmh6nFIBeJzTugn5JTU6OOyG0lDOo3R9KwTxTYbo=
+github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-go.lsp.dev/uri v0.3.0/go.mod h1:P5sbO1IQR+qySTWOCnhnK7phBx+W3zbLqSMDJNTw88I=
+github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70=
+github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
+golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w=
+golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
+golang.org/x/exp/shiny v0.0.0-20240707233637-46b078467d37 h1:SOSg7+sueresE4IbmmGM60GmlIys+zNX63d6/J4CMtU=
+golang.org/x/exp/shiny v0.0.0-20240707233637-46b078467d37/go.mod h1:3F+MieQB7dRYLTmnncoFbb1crS5lfQoTfDgQy6K4N0o=
+golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
+golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
+golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
+golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
+golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
-gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
-gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg=
+gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98=
+gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg=
+gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
+gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE=
+gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8=
+gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
+gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -1,61 +1,42 @@
 package main
 
 import (
-	"flag"
 	"fmt"
 	"os"
 
-	"github.com/gotk3/gotk3/gtk"
+	"gioui.org/app"
+	"gioui.org/op"
+	"gioui.org/widget/material"
 )
 
 const (
-	version = "2.1.5.2"
+	version = "3.0.0-alpha1"
-)
-
-var (
-	master    map[string][]app
-	linmaster map[string][]app
-	cats      []string
-	lin       []string
-	comEnbld  bool
-	populated bool
 )
 
 func main() {
-	forced := flag.Bool("force-update", false, "Force the update dialog to be shown")
+	go func() {
-	flag.Parse()
+		w := &app.Window{}
-	os.MkdirAll("PortableApps/LinuxPACom", 0777)
+		w.Option(app.Size(500, 500), app.Title("LinuxPA"))
-	master = make(map[string][]app)
+		if err := ui(w); err != nil {
-	linmaster = make(map[string][]app)
+			fmt.Println(err)
-	uiStart(*forced)
+		}
+		os.Exit(0)
+	}()
+	app.Main()
 }
 
-func uiStart(forced bool) {
+func ui(w *app.Window) error {
-	gtk.Init(nil)
+	th := material.NewTheme()
-	setup()
+	op := &op.Ops{}
-	win, err := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
+	for {
-	if err != nil {
+		switch e := w.Event().(type) {
-		fmt.Println("Window not created", err)
+		case app.DestroyEvent:
+			return e.Err
+		case app.FrameEvent:
+			ctx := app.NewContext(op, e)
+			lbl := material.Body1(th, "Hello there!")
+			lbl.Layout(ctx)
+			e.Frame(op)
 		}
-	win.SetTitle("LinuxPA")
-	win.Connect("destroy", func() {
-		savePrefs()
-		gtk.MainQuit()
-	})
-	win.SetDefaultSize(500, 500)
-	win.SetPosition(gtk.WIN_POS_CENTER)
-	ui(win)
-	win.ShowAll()
-	win.Show()
-	update(win, forced)
-	gtk.Main()
-}
-
-func contains(arr []string, str string) bool {
-	for _, v := range arr {
-		if v == str {
-			return true
 	}
-	}
-	return false
 }

main_test.go

@@ -0,0 +1,66 @@
+package main
+
+import (
+	"errors"
+	"io"
+	"net/http"
+	"os"
+	"os/exec"
+	"testing"
+)
+
+const (
+	testImage = "https://darkstorm.tech/files/LinuxPATest.sfs"
+)
+
+func setupTestEnv() error {
+	_, err := exec.LookPath("unsquashfs")
+	if err != nil {
+		return errors.New("unsquashfs not installed")
+	}
+	fold, err := os.Stat("testing")
+	if os.IsNotExist(err) {
+		err = os.Mkdir("testing", 0777)
+		if err != nil {
+			return err
+		}
+		fold, err = os.Stat("testing")
+		if err != nil {
+			return err
+		}
+	} else if err != nil {
+		return err
+	}
+	os.RemoveAll("testing/PortableApps")
+	os.RemoveAll("testing/Documents")
+	os.RemoveAll("testing/Start.exe")
+	if !fold.IsDir() {
+		return errors.New("./testing is not a directory!!!")
+	}
+	img, err := os.Open("testing/LinuxPATest.sfs")
+	if os.IsNotExist(err) {
+		img, err = os.Create("testing/LinuxPATest.sfs")
+		if err != nil {
+			return errors.New("Cannot create testing/LinuxPATest.sfs")
+		}
+		resp, err := http.DefaultClient.Get(testImage)
+		if err != nil {
+			return err
+		}
+		_, err = io.Copy(img, resp.Body)
+		resp.Body.Close()
+		if err != nil {
+			return err
+		}
+	}
+	err = exec.Command("unsquashfs", "-d", "./testing", "./testing/LinuxPATest.sfs").Run()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func TestStuff(t *testing.T) {
+	setupTestEnv()
+	main()
+}

preferences.go

@@ -1,72 +0,0 @@
-package main
-
-import (
-	"encoding/gob"
-	"os"
-)
-
-var (
-	wine          bool
-	wineAvail     bool
-	portableHide  bool
-	betaUpdate    bool
-	versionNewest = true
-	paDirs        = true
-)
-
-func savePrefs() {
-	os.Remove("PortableApps/LinuxPACom/Prefs.gob")
-	fil, err := os.Create("PortableApps/LinuxPACom/Prefs.gob")
-	if err != nil {
-		return
-	}
-	enc := gob.NewEncoder(fil)
-	err = enc.Encode(wine)
-	if err != nil {
-		return
-	}
-	err = enc.Encode(portableHide)
-	if err != nil {
-		return
-	}
-	err = enc.Encode(versionNewest)
-	if err != nil {
-		return
-	}
-	err = enc.Encode(paDirs)
-	if err != nil {
-		return
-	}
-	err = enc.Encode(betaUpdate)
-	if err != nil {
-		return
-	}
-}
-
-func loadPrefs() {
-	fil, err := os.Open("PortableApps/LinuxPACom/Prefs.gob")
-	if err != nil {
-		return
-	}
-	dec := gob.NewDecoder(fil)
-	err = dec.Decode(&wine)
-	if err != nil {
-		return
-	}
-	err = dec.Decode(&portableHide)
-	if err != nil {
-		return
-	}
-	err = dec.Decode(&versionNewest)
-	if err != nil {
-		return
-	}
-	err = dec.Decode(&paDirs)
-	if err != nil {
-		return
-	}
-	err = dec.Decode(&betaUpdate)
-	if err != nil {
-		return
-	}
-}

settings.go

@@ -1,206 +0,0 @@
-package main
-
-import (
-	"io/ioutil"
-	"os"
-	"os/exec"
-
-	"github.com/gotk3/gotk3/glib"
-	"github.com/gotk3/gotk3/gtk"
-)
-
-const (
-	commonHelp = "The common.sh is run before every app is launched and allows you to set variables such as $HOME. For directories, ALWAYS start the directory with $PWD which points to the directory where LinuxPA is. To allow for greater customization and isolation, you can use the $FILENAME variable which is the filename of the executable you're using and the $APPNAME variable which is the name of the app being lanched."
-)
-
-func settingsUI(parent *gtk.Window, onExit func()) {
-	win, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
-	win.SetTransientFor(parent)
-	parent.SetSensitive(false)
-	win.SetDefaultSize(600, 300)
-	win.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
-	win.Connect("destroy", func() {
-		savePrefs()
-		parent.SetSensitive(true)
-		onExit()
-	})
-	comTagTbl, _ := gtk.TextTagTableNew()
-	comBuf, _ := gtk.TextBufferNew(comTagTbl)
-	ntbk, _ := gtk.NotebookNew()
-	gnrl, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-	gnrl.SetMarginStart(10)
-	gnrl.SetMarginEnd(10)
-	gnrl.SetMarginTop(10)
-	gnrl.SetMarginBottom(10)
-	dlWine, _ := gtk.ButtonNewWithLabel("Download Wine")
-	wineCheck, _ := gtk.CheckButtonNewWithLabel("Show Windows apps (Wine)")
-	wineLbl, _ := gtk.LabelNew("PortableApps/LinuxPACom/Wine present")
-	dlWine.Connect("clicked", func() {
-		cb := make(chan bool)
-		downloadWine(win, cb)
-		go func() {
-			v := <-cb
-			if v {
-				setupTxt(comBuf)
-				wineLbl.Show()
-			}
-			if _, err := os.Open("PortableApps/LinuxPACom/Wine"); os.IsNotExist(err) {
-				if _, errd := exec.LookPath("wine"); errd == nil {
-					wineAvail = true
-				}
-			} else if err == nil {
-				wineAvail = true
-			}
-			glib.IdleAdd(func() {
-				if !wineAvail {
-					wineCheck.SetSensitive(false)
-					wineCheck.SetTooltipText("Download wine to run windows apps")
-				} else {
-					wineCheck.SetSensitive(true)
-					wineCheck.SetTooltipText("")
-				}
-			})
-		}()
-	})
-	if !comEnbld {
-		dlWine.SetSensitive(false)
-		dlWine.SetTooltipText("common.sh needed")
-	}
-	pthdCheck, _ := gtk.CheckButtonNewWithLabel("Hide \"Portable\" from app name")
-	pthdCheck.Connect("toggled", func() {
-		portableHide = pthdCheck.GetActive()
-		master = make(map[string][]app)
-		linmaster = make(map[string][]app)
-		cats = make([]string, 0)
-		lin = make([]string, 0)
-		setup()
-	})
-	pthdCheck.SetActive(portableHide)
-	if !wineAvail {
-		wineCheck.SetSensitive(false)
-		wineCheck.SetTooltipText("Download wine to run windows apps")
-	}
-	wineCheck.SetActive(wine)
-	wineCheck.Connect("toggled", func() {
-		wine = wineCheck.GetActive()
-	})
-	versCheck, _ := gtk.CheckButtonNewWithLabel("Only show newest app version in downloads (A bit iffy ATM)")
-	versCheck.SetActive(versionNewest)
-	versCheck.Connect("toggled", func() {
-		versionNewest = versCheck.GetActive()
-	})
-	paDirsCheck, _ := gtk.CheckButtonNewWithLabel("Create .home and .config directories for AppImages")
-	paDirsCheck.SetActive(paDirs)
-	paDirsCheck.Connect("toggled", func() {
-		paDirs = paDirsCheck.GetActive()
-	})
-	betaCheck, _ := gtk.CheckButtonNewWithLabel("Update to beta releases")
-	gnrl.Add(wineLbl)
-	gnrl.Add(dlWine)
-	gnrl.Add(pthdCheck)
-	gnrl.Add(wineCheck)
-	gnrl.Add(versCheck)
-	gnrl.Add(paDirsCheck)
-	gnrl.Add(betaCheck)
-	ntbk.AppendPage(gnrl, getLabel("General"))
-	com, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-	com.SetMarginStart(10)
-	com.SetMarginEnd(10)
-	com.SetMarginTop(10)
-	com.SetMarginBottom(10)
-	comEdit, _ := gtk.TextViewNewWithBuffer(comBuf)
-	comEdit.SetVExpand(true)
-	comEdit.SetHExpand(true)
-	vScroll, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	hScroll, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	comScrl, _ := gtk.ScrolledWindowNew(hScroll, vScroll)
-	comScrl.Add(comEdit)
-	svBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
-	sv, _ := gtk.ButtonNewWithLabel("Save")
-	sv.Connect("clicked", func() {
-		beg, end := comBuf.GetBounds()
-		txt, _ := comBuf.GetText(beg, end, true)
-		ioutil.WriteFile("PortableApps/LinuxPACom/common.sh", []byte(txt), 0777)
-	})
-	cnl, _ := gtk.ButtonNewWithLabel("Cancel")
-	cnl.Connect("clicked", func() {
-		setupTxt(comBuf)
-	})
-	info, _ := gtk.ButtonNewWithLabel("Info")
-	info.Connect("clicked", func() {
-		infoBox, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
-		infoBox.SetTransientFor(parent)
-		infoBox.SetDefaultSize(300, 80)
-		infoBox.SetName("common.sh info")
-		infoBox.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
-		box, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-		infolbl, _ := gtk.LabelNew(commonHelp)
-		infolbl.SetLineWrap(true)
-		infolbl.SetSizeRequest(200, 50)
-		box.Add(infolbl)
-		infoBox.Add(box)
-		infoBox.ShowAll()
-		infoBox.Show()
-	})
-	svBox.Add(sv)
-	svBox.Add(cnl)
-	svBox.Add(info)
-	com.Add(comScrl)
-	com.Add(svBox)
-	ntbk.AppendPage(com, getLabel("common.sh"))
-	win.Add(ntbk)
-	win.ShowAll()
-	if !comEnbld {
-		comScrl.Hide()
-		svBox.Hide()
-		mkCom, _ := gtk.ButtonNewWithLabel("Create common.sh")
-		mkCom.Connect("clicked", func() {
-			err := ioutil.WriteFile("PortableApps/LinuxPACom/common.sh", []byte("export HOME=$PWD/PortableApps/LinuxPACom/Home"), 0777)
-			if err == nil {
-				mkCom.Hide()
-				comScrl.Show()
-				svBox.Show()
-				setupTxt(comBuf)
-				comEnbld = true
-				dlWine.SetSensitive(true)
-				dlWine.SetTooltipText("")
-			}
-		})
-		in, _ := gtk.ButtonNewWithLabel("Info")
-		in.Connect("clicked", func() {
-			infoBox, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
-			infoBox.SetTransientFor(parent)
-			infoBox.SetDefaultSize(300, 80)
-			infoBox.SetName("common.sh info")
-			infoBox.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
-			box, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-			infolbl, _ := gtk.LabelNew(commonHelp)
-			infolbl.SetLineWrap(true)
-			infolbl.SetSizeRequest(200, 50)
-			box.Add(infolbl)
-			infoBox.Add(box)
-			infoBox.ShowAll()
-			infoBox.Show()
-		})
-		mkCom.Show()
-		com.Add(mkCom)
-		com.Add(in)
-	} else {
-		setupTxt(comBuf)
-	}
-	if _, err := os.Open("PortableApps/LinuxPACom/Wine"); err != nil && os.IsNotExist(err) {
-		wineLbl.Hide()
-	}
-	win.Show()
-}
-
-func setupTxt(buf *gtk.TextBuffer) {
-	fil, _ := os.Open("PortableApps/LinuxPACom/common.sh")
-	btys, _ := ioutil.ReadAll(fil)
-	buf.SetText(string(btys))
-}
-
-func getLabel(name string) *gtk.Label {
-	lbl, _ := gtk.LabelNew(name)
-	return lbl
-}

setup.go

@@ -1,294 +0,0 @@
-package main
-
-import (
-	"bufio"
-	_ "image/png"
-	"os"
-	"os/exec"
-	"reflect"
-	"sort"
-	"strings"
-
-	goappimage "github.com/CalebQ42/GoAppImage"
-	"github.com/gotk3/gotk3/gdk"
-	"github.com/gotk3/gotk3/gtk"
-)
-
-func setup() {
-	loadPrefs()
-	if _, err := os.Open("PortableApps/LinuxPACom/Wine"); os.IsNotExist(err) {
-		if _, errd := exec.LookPath("wine"); errd == nil {
-			wineAvail = true
-		}
-	} else if err == nil {
-		wineAvail = true
-	}
-	if !wineAvail {
-		wine = false
-	}
-	PortableAppsFold, err := os.Open("PortableApps")
-	if PAStat, _ := PortableAppsFold.Stat(); err != nil || !PAStat.IsDir() {
-		os.Mkdir("PortableApps", 0777)
-		PortableAppsFold, err = os.Open("PortableApps")
-		if err != nil {
-			panic("Can't find PortableApps folder and can't create one!")
-		}
-	}
-	if _, err = os.Open("PortableApps/LinuxPACom"); err != nil {
-		os.Mkdir("PortableApps/LinuxPACom", 0777)
-	}
-	_, err = os.Open("PortableApps/LinuxPACom/common.sh")
-	if err == nil {
-		comEnbld = true
-	}
-	PAFolds, _ := PortableAppsFold.Readdirnames(-1)
-	sort.Strings(PAFolds)
-	for _, v := range PAFolds {
-		fold, _ := os.Open("PortableApps/" + v)
-		if stat, _ := fold.Stat(); stat.IsDir() && stat.Name() != "PortableApps.com" && stat.Name() != "LinuxPACom" {
-			ap := processApp("PortableApps/" + v)
-			if !reflect.DeepEqual(ap, app{}) {
-				if _, ok := master[ap.cat]; !ok {
-					cats = append(cats, ap.cat)
-					sort.Strings(cats)
-				}
-				if len(ap.lin) != 0 {
-					if _, ok := linmaster[ap.cat]; !ok {
-						lin = append(lin, ap.cat)
-						sort.Strings(lin)
-					}
-				}
-				master[ap.cat] = append(master[ap.cat], ap)
-				if len(ap.lin) != 0 {
-					linmaster[ap.cat] = append(linmaster[ap.cat], ap)
-				}
-			}
-		}
-	}
-	populated = true
-}
-
-func processApp(fold string) (out app) {
-	wd, _ := os.Getwd()
-	out.dir = wd + "/" + fold
-	folder, _ := os.Open(fold)
-	fis, _ := folder.Readdirnames(-1)
-	for _, v := range fis {
-		tmp, _ := os.Open(fold + "/" + v)
-		stat, _ := tmp.Stat()
-		if stat.IsDir() {
-			continue
-		}
-		//TODO: check permission to see if it has exec permission
-		if strings.HasSuffix(strings.ToLower(v), ".appimage") {
-			out.appimg = append(out.appimg, v)
-			out.ex = append(out.ex, v)
-			out.lin = append(out.lin, v)
-		} else if strings.HasSuffix(strings.ToLower(v), ".exe") {
-			out.ex = append(out.ex, v)
-		} else {
-			btys := make([]byte, 4)
-			rdr := bufio.NewReader(tmp)
-			rdr.Read(btys)
-			if (strings.Contains(strings.ToLower(string(btys)), "elf") && !strings.HasSuffix(strings.ToLower(v), ".so") && !strings.Contains(v, ".so.")) || strings.HasPrefix(strings.ToLower(string(btys)), "#!") {
-				out.ex = append(out.ex, v)
-				out.lin = append(out.lin, v)
-			}
-		}
-	}
-	if len(out.ex) == 0 {
-		return app{}
-	}
-	if len(out.lin) == 0 {
-		out.name += " (Wine)"
-		out.wine = true
-	}
-	out.icon = getIcon(fold)
-	out.ini = findInfo(fold)
-	if out.ini != nil {
-		out.name = getName(out.ini)
-		out.cat = getCat(out.ini)
-	}
-	if len(out.appimg) > 0 && out.name == "" && out.cat == "" && out.icon == nil {
-		os.Mkdir(out.dir+"/.appimageconfig", 0777)
-		ai := goappimage.NewAppImage(out.dir + "/" + out.appimg[0])
-		fil, err := os.Open(out.dir + "/.appimageconfig/the.md5")
-		if os.IsNotExist(err) {
-			ai.ExtractFile("*.desktop", out.dir+"/.appimageconfig/", false)
-			appimageconfig, _ := os.Open(out.dir + "/.appimageconfig")
-			appdirs, _ := appimageconfig.Readdirnames(-1)
-			for _, dirs := range appdirs {
-				desktopFil, _ := os.Open(out.dir + "/.appimageconfig/" + dirs)
-				if stat, _ := desktopFil.Stat(); strings.HasSuffix(dirs, ".desktop") && !stat.IsDir() {
-					os.Rename(out.dir+"/.appimageconfig/"+dirs, out.dir+"/.appimageconfig/the.desktop")
-					break
-				}
-			}
-			desk, _ := os.Open(out.dir + "/.appimageconfig/the.desktop")
-			name, cat, icon := extractDesktopInfo(desk)
-			if out.name == "" {
-				out.name = name
-			}
-			if out.cat == "" {
-				out.cat = cat
-			}
-			if out.icon == nil {
-				it, _ := gtk.IconThemeGetDefault()
-				out.icon, err = it.LoadIcon(icon, 64, gtk.ICON_LOOKUP_GENERIC_FALLBACK)
-			}
-			fil, _ = os.Create(out.dir + "/.appimageconfig/the.md5")
-			wrtr := bufio.NewWriter(fil)
-			wrtr.WriteString(ai.Md5)
-			wrtr.Flush()
-		} else {
-			rdr := bufio.NewReader(fil)
-			filMd, _, _ := rdr.ReadLine()
-			oldMd := string(filMd)
-			if oldMd != ai.Md5 {
-				ai.ExtractFile("*.desktop", out.dir+"/.appimageconfig/", false)
-				appimageconfig, _ := os.Open(out.dir + "/.appimageconfig")
-				appdirs, _ := appimageconfig.Readdirnames(-1)
-				for _, dirs := range appdirs {
-					desktopFil, _ := os.Open(out.dir + "/.appimageconfig/" + dirs)
-					if stat, _ := desktopFil.Stat(); strings.HasSuffix(dirs, ".desktop") && !stat.IsDir() {
-						os.Rename(out.dir+"/.appimageconfig/"+dirs, out.dir+"/.appimageconfig/the.desktop")
-						break
-					}
-				}
-				os.Remove(out.dir + "/.appimageconfig/the.md5")
-				fil, _ = os.Create(out.dir + "/.appimageconfig/the.md5")
-				wrtr := bufio.NewWriter(fil)
-				wrtr.WriteString(ai.Md5)
-				wrtr.Flush()
-			}
-		}
-		desk, _ := os.Open(out.dir + "/.appimageconfig/the.desktop")
-		name, cat, icon := extractDesktopInfo(desk)
-		if out.name == "" {
-			out.name = name
-		}
-		if out.cat == "" {
-			out.cat = cat
-		}
-		if out.icon == nil {
-			it, _ := gtk.IconThemeGetDefault()
-			out.icon, err = it.LoadIcon(icon, 32, gtk.ICON_LOOKUP_GENERIC_FALLBACK)
-		}
-	}
-	if out.name == "" {
-		out.name = strings.TrimPrefix(fold, "PortableApps/")
-	}
-	if out.cat == "" {
-		out.cat = "Other"
-	}
-	if portableHide {
-		out.name = strings.TrimSuffix(out.name, "Portable")
-	}
-	out.name = strings.TrimSpace(out.name)
-	return
-}
-
-func getCat(ini *os.File) string {
-	rdr := bufio.NewReader(ini)
-	var ret string
-	for line, _, err := rdr.ReadLine(); err == nil; line, _, err = rdr.ReadLine() {
-		if strings.HasPrefix(string(line), "Category=") {
-			ret = strings.TrimPrefix(string(line), "Category=")
-			break
-		} else if strings.HasPrefix(string(line), "category=") {
-			ret = strings.TrimPrefix(string(line), "category=")
-		}
-	}
-	rdr.Reset(ini)
-	return ret
-}
-
-func extractDesktopInfo(desk *os.File) (name, category, iconName string) {
-	rdr := bufio.NewReader(desk)
-	var nameGot, catGot, iconGot bool
-	for line, _, err := rdr.ReadLine(); err == nil; line, _, err = rdr.ReadLine() {
-		ln := string(line)
-		if !nameGot && strings.HasPrefix(ln, "Name=") {
-			name = strings.TrimPrefix(ln, "Name=")
-			nameGot = true
-		} else if !catGot && strings.HasPrefix(ln, "Categories=") {
-			cats := strings.Split(strings.TrimPrefix(ln, "Categories="), ";")
-			if len(cats) > 0 {
-				category = cats[0]
-			}
-			catGot = true
-		} else if !iconGot && strings.HasPrefix(ln, "Icon=") {
-			iconName = strings.TrimPrefix(ln, "Icon=")
-			iconGot = true
-		}
-		if nameGot && catGot && iconGot {
-			break
-		}
-	}
-	return
-}
-
-func getName(ini *os.File) string {
-	rdr := bufio.NewReader(ini)
-	var ret string
-	for line, _, err := rdr.ReadLine(); err == nil; line, _, err = rdr.ReadLine() {
-		if strings.HasPrefix(string(line), "Name=") {
-			ret = strings.TrimPrefix(string(line), "Name=")
-			break
-		} else if strings.HasPrefix(string(line), "name=") {
-			ret = strings.TrimPrefix(string(line), "name=")
-			break
-		}
-	}
-	rdr.Reset(ini)
-	return ret
-}
-
-func getIcon(fold string) *gdk.Pixbuf {
-	var pic string
-	if _, err := os.Open(fold + "/appicon.png"); err == nil {
-		pic = fold + "/appicon.png"
-	} else if folder, err := os.Open(fold + "/App/AppInfo"); err == nil {
-		fis, _ := folder.Readdir(-1)
-		var pics []string
-		for _, v := range fis {
-			if !v.IsDir() && strings.HasSuffix(strings.ToLower(v.Name()), ".png") && strings.HasPrefix(strings.ToLower(v.Name()), "appicon_") {
-				pics = append(pics, v.Name())
-			}
-		}
-		sort.Strings(pics)
-		if len(pics) > 1 {
-			var ind int
-			if !contains(pics, "appicon_32.png") {
-				ind = len(pics) - 1
-			} else {
-				ind = sort.SearchStrings(pics, "appicon_32.png")
-			}
-			pic = fold + "/App/AppInfo/" + pics[ind]
-		}
-	} else {
-		img, _ := gtk.ImageNewFromIconName("application-x-executable", gtk.ICON_SIZE_BUTTON)
-		buf := img.GetPixbuf()
-		return buf
-	}
-	img, _ := gtk.ImageNewFromFile(pic)
-	buf, _ := img.GetPixbuf().ScaleSimple(32, 32, gdk.INTERP_BILINEAR)
-	return buf
-}
-
-func findInfo(fold string) *os.File {
-	if fi, err := os.Open(fold + "/appinfo.ini"); err == nil {
-		return fi
-	}
-	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
-			}
-		}
-	}
-	return nil
-}

ui.go

@@ -1,174 +0,0 @@
-package main
-
-import (
-	"github.com/gotk3/gotk3/glib"
-	"github.com/gotk3/gotk3/gtk"
-	"github.com/pkg/browser"
-)
-
-func ui(win *gtk.Window) {
-	ls := getCatRows()
-	var treeApps []*gtk.TreeIter
-	header, _ := gtk.HeaderBarNew()
-	header.SetShowCloseButton(true)
-	header.SetTitle("LinuxPA")
-	header.SetSubtitle("PortableApps.com type launcher")
-	settings, _ := gtk.ButtonNewFromIconName("applications-system", gtk.ICON_SIZE_SMALL_TOOLBAR)
-	settings.SetTooltipText("Settings")
-	dnl, _ := gtk.ButtonNewFromIconName("emblem-downloads", gtk.ICON_SIZE_SMALL_TOOLBAR)
-	dnl.SetTooltipText("Download Apps")
-	header.PackStart(settings)
-	header.PackEnd(dnl)
-	win.SetTitlebar(header)
-	topLvl, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 0)
-	lrBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
-	catList, _ := gtk.ListBoxNew()
-	catList.SetActivateOnSingleClick(true)
-	store, _ := gtk.TreeStoreNew(glib.TYPE_OBJECT, glib.TYPE_STRING)
-	appsList, _ := gtk.TreeViewNewWithModel(store)
-	render, _ := gtk.CellRendererPixbufNew()
-	pixColumn, _ := gtk.TreeViewColumnNewWithAttribute("", render, "pixbuf", 0)
-	txtRender, _ := gtk.CellRendererTextNew()
-	txtColumn, _ := gtk.TreeViewColumnNewWithAttribute("", txtRender, "text", 1)
-	appsList.AppendColumn(pixColumn)
-	appsList.AppendColumn(txtColumn)
-	appsList.SetHeadersVisible(false)
-	catList.SetHExpand(true)
-	catList.SetVExpand(true)
-	appsList.SetHExpand(true)
-	appsList.SetVExpand(true)
-	vScrollCat, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	hScrollCat, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	vScrollApp, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	hScrollApp, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	catScrl, _ := gtk.ScrolledWindowNew(hScrollCat, vScrollCat)
-	catScrl.Add(catList)
-	catScrl.SetSizeRequest(170, 500)
-	appScrl, _ := gtk.ScrolledWindowNew(hScrollApp, vScrollApp)
-	appScrl.Add(appsList)
-	appScrl.SetSizeRequest(300, 500)
-	lrBox.Add(catScrl)
-	lrBox.Add(appScrl)
-	botBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 2)
-	botBox.SetMarginStart(10)
-	botBox.SetMarginEnd(10)
-	botBox.SetMarginTop(10)
-	botBox.SetMarginBottom(10)
-	edit, _ := gtk.ButtonNewWithLabel("Edit App..")
-	edit.Connect("clicked", func() {
-		selec, _ := appsList.GetSelection()
-		_, it, ok := selec.GetSelected()
-		if ok {
-			pth, _ := store.GetPath(it)
-			ind := pth.GetIndices()
-			if wine {
-				appLnch := master[cats[catList.GetSelectedRow().GetIndex()]][ind[0]]
-				appLnch.edit(win, func() {
-					store.Clear()
-					for i := range ls {
-						catList.Remove(catList.GetRowAtIndex(len(ls) - i - 1))
-					}
-					ls = getCatRows()
-					for i, v := range ls {
-						catList.Insert(v, i)
-					}
-					catList.ShowAll()
-				})
-			} else {
-				appLnch := linmaster[lin[catList.GetSelectedRow().GetIndex()]][ind[0]]
-				appLnch.edit(win, func() {
-					store.Clear()
-					for i := range ls {
-						catList.Remove(catList.GetRowAtIndex(len(ls) - i - 1))
-					}
-					ls = getCatRows()
-					for i, v := range ls {
-						catList.Insert(v, i)
-					}
-					catList.ShowAll()
-				})
-			}
-		}
-	})
-	botBox.PackEnd(edit, false, false, 0)
-	topLvl.Add(lrBox)
-	topLvl.PackEnd(botBox, false, true, 0)
-	win.Add(topLvl)
-	for _, v := range ls {
-		catList.Add(v)
-	}
-	catList.Connect("row-selected", func() {
-		store.Clear()
-		if catList.GetSelectedRow().GetIndex() >= 0 {
-			treeApps = make([]*gtk.TreeIter, 0)
-			if wine {
-				apps := master[cats[catList.GetSelectedRow().GetIndex()]]
-				for _, v := range apps {
-					treeApps = append(treeApps, v.getTreeIter(store))
-				}
-			} else {
-				apps := linmaster[lin[catList.GetSelectedRow().GetIndex()]]
-				for _, v := range apps {
-					treeApps = append(treeApps, v.getTreeIter(store))
-				}
-			}
-		}
-	})
-	appsList.Connect("row-activated", func() {
-		selec, _ := appsList.GetSelection()
-		_, it, ok := selec.GetSelected()
-		if ok {
-			pth, _ := store.GetPath(it)
-			ind := pth.GetIndices()
-			if len(ind) == 1 {
-				if wine {
-					appLnch := master[cats[catList.GetSelectedRow().GetIndex()]][ind[0]]
-					appLnch.launch()
-				} else {
-					appLnch := linmaster[lin[catList.GetSelectedRow().GetIndex()]][ind[0]]
-					appLnch.launch()
-				}
-			} else if len(ind) == 2 {
-				if wine {
-					appLnch := master[cats[catList.GetSelectedRow().GetIndex()]][ind[0]]
-					appLnch.launchSub(ind[1])
-				} else {
-					appLnch := linmaster[lin[catList.GetSelectedRow().GetIndex()]][ind[0]]
-					appLnch.launchSub(ind[1])
-				}
-			}
-		}
-	})
-	dnl.Connect("clicked", func() {
-		//TODO: detect if a webbrowser app is available and use that instead
-		browser.OpenURL("https://appimage.github.io/apps/")
-	})
-	settings.Connect("clicked", func() {
-		settingsUI(win, func() {
-			store.Clear()
-			for i := range ls {
-				catList.Remove(catList.GetRowAtIndex(len(ls) - i - 1))
-			}
-			ls = getCatRows()
-			for i, v := range ls {
-				catList.Insert(v, i)
-			}
-			catList.ShowAll()
-		})
-	})
-}
-
-func getCatRows() (out []*gtk.Label) {
-	if wine {
-		for _, v := range cats {
-			txt, _ := gtk.LabelNew(v)
-			out = append(out, txt)
-		}
-	} else {
-		for _, v := range lin {
-			txt, _ := gtk.LabelNew(v)
-			out = append(out, txt)
-		}
-	}
-	return
-}

update.go

@@ -1,264 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"github.com/gotk3/gotk3/gtk"
-)
-
-const (
-	versionURL       = "https://www.dropbox.com/s/a0xizzo0a4vsfqt/Version?dl=1"
-	downloadURL      = "https://github.com/CalebQ42/LinuxPA/releases/download/vXXX/LinuxPA"
-	changelogURL     = "https://www.dropbox.com/s/rk8ec9p14imkh03/Changelog?dl=1"
-	changelogBetaURL = "https://www.dropbox.com/s/h2u34g5s8qr8sef/ChangelogBeta?dl=1"
-)
-
-//Thanks to https://www.socketloop.com/tutorials/golang-download-file-example
-//For some of the code
-
-//Returns if success
-func versionDL() (bool, error) {
-	versionFile, err := os.Create("PortableApps/LinuxPACom/Version")
-	if err != nil {
-		return false, err
-	}
-	versionFile.Chmod(0777)
-	check := http.Client{
-		CheckRedirect: func(r *http.Request, via []*http.Request) error {
-			r.URL.Opaque = r.URL.Path
-			return nil
-		},
-	}
-	response, err := check.Get(versionURL)
-	if err != nil {
-		return false, err
-	}
-	_, err = io.Copy(versionFile, response.Body)
-	if err != nil {
-		return false, err
-	}
-	return true, nil
-}
-
-func getVersionFileInfo() (stable string, beta string) {
-	fil, err := os.Open("PortableApps/LinuxPACom/Version")
-	if err != nil {
-		return "Error!", ""
-	}
-	rdr := bufio.NewReader(fil)
-	out, _, _ := rdr.ReadLine()
-	stable = string(out)
-	out, _, _ = rdr.ReadLine()
-	beta = string(out)
-	return
-}
-
-func changelogDL() (bool, error) {
-	changelogFile, err := os.Create("PortableApps/LinuxPACom/Changelog")
-	if err != nil {
-		return false, err
-	}
-	changelogFile.Chmod(0777)
-	check := http.Client{
-		CheckRedirect: func(r *http.Request, via []*http.Request) error {
-			r.URL.Opaque = r.URL.Path
-			return nil
-		},
-	}
-	var response *http.Response
-	if betaUpdate {
-		response, err = check.Get(changelogBetaURL)
-	} else {
-		response, err = check.Get(changelogURL)
-	}
-	if err != nil {
-		return false, err
-	}
-	_, err = io.Copy(changelogFile, response.Body)
-	if err != nil {
-		return false, err
-	}
-	return true, nil
-}
-
-func getChangelog() string {
-	fil, err := os.Open("PortableApps/LinuxPACom/Changelog")
-	if err != nil {
-		return "Error!"
-	}
-	out, _ := ioutil.ReadAll(fil)
-	return string(out)
-}
-
-func checkForUpdate(stable, beta string) (bool, error) {
-	new := stable
-	if betaUpdate {
-		new = beta
-	}
-	curSlice := strings.Split(version, ".")
-	newSlice := strings.Split(new, ".")
-	curNums := make([]int, 4)
-	newNums := make([]int, 4)
-	for i, v := range curSlice {
-		num, err := strconv.Atoi(v)
-		if err == nil {
-			curNums[i] = num
-		}
-		num, err = strconv.Atoi(newSlice[i])
-		if err == nil {
-			newNums[i] = num
-		} else {
-			return false, err
-		}
-		if newNums[i] > curNums[i] {
-			return true, nil
-		} else if curNums[i] > newNums[i] {
-			return false, nil
-		}
-	}
-	return false, nil
-}
-
-func downloadUpdate(newVersion string) (bool, error) {
-	url := strings.Replace(downloadURL, "XXX", newVersion, -1)
-	err := os.Rename("LinuxPA", ".LinuxPA.old")
-	if err != nil {
-		return false, err
-	}
-	fil, err := os.Create("LinuxPA")
-	fil.Chmod(0777)
-	defer fil.Close()
-	if err != nil {
-		os.Rename(".LinuxPA.old", "LinuxPA")
-		return false, err
-	}
-	check := http.Client{
-		CheckRedirect: func(r *http.Request, via []*http.Request) error {
-			r.URL.Opaque = r.URL.Path
-			return nil
-		},
-	}
-	re, err := check.Get(url)
-	if err != nil {
-		return false, err
-	}
-	defer re.Body.Close()
-	_, err = io.Copy(fil, re.Body)
-	if err != nil {
-		return false, err
-	}
-	return true, nil
-}
-
-func update(win *gtk.Window, forced bool) {
-	stat, err := versionDL()
-	if stat {
-		stable, beta := getVersionFileInfo()
-		if stable != "Error!" {
-			stat, err = checkForUpdate(stable, beta)
-			if stat || forced {
-				stat, err = changelogDL()
-				if stat {
-					updateWin, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
-					updateWin.SetTransientFor(win)
-					updateWin.SetPosition(gtk.WIN_POS_CENTER)
-					updateWin.SetDefaultSize(600, 300)
-					topLvl, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-					lbl, _ := gtk.LabelNew("There's a new update! Here's the changelog:")
-					tagTbl, _ := gtk.TextTagTableNew()
-					buf, _ := gtk.TextBufferNew(tagTbl)
-					tv, _ := gtk.TextViewNewWithBuffer(buf)
-					tv.SetWrapMode(gtk.WRAP_WORD)
-					tv.SetEditable(false)
-					buf.SetText(getChangelog())
-					butBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
-					upBut, _ := gtk.ButtonNewWithLabel("Update")
-					upBut.Connect("clicked", func() {
-						updateWin.Close()
-						actuallyUpdate(win, forced)
-					})
-					cnlBut, _ := gtk.ButtonNewWithLabel("Cancel")
-					cnlBut.Connect("clicked", func() {
-						updateWin.Close()
-					})
-					butBox.Add(upBut)
-					butBox.Add(cnlBut)
-					topLvl.Add(lbl)
-					topLvl.Add(tv)
-					topLvl.Add(butBox)
-					topLvl.SetMarginBottom(10)
-					topLvl.SetMarginEnd(10)
-					topLvl.SetMarginStart(10)
-					topLvl.SetMarginTop(10)
-					updateWin.Add(topLvl)
-					updateWin.ShowAll()
-					updateWin.Show()
-				} else {
-					fmt.Println(err)
-				}
-			} else {
-				fmt.Println(err)
-			}
-		} else {
-			fmt.Println("Failed Version File Info")
-		}
-	} else {
-		fmt.Println(err)
-	}
-}
-
-func actuallyUpdate(win *gtk.Window, forced bool) {
-	updateWin, _ := gtk.WindowNew(gtk.WINDOW_POPUP)
-	updateWin.SetTransientFor(win)
-	updateWin.SetSizeRequest(150, 50)
-	topLvl, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-	spin, _ := gtk.SpinnerNew()
-	spin.Start()
-	lbl, _ := gtk.LabelNew("Updating")
-	topLvl.Add(spin)
-	topLvl.Add(lbl)
-	topLvl.SetMarginBottom(10)
-	topLvl.SetMarginEnd(10)
-	topLvl.SetMarginStart(10)
-	topLvl.SetMarginTop(10)
-	updateWin.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
-	updateWin.Add(topLvl)
-	updateWin.ShowAll()
-	updateWin.Show()
-	go func(win, updateWin *gtk.Window) {
-		defer updateWin.Close()
-		stat, err := versionDL()
-		if stat {
-			stable, beta := getVersionFileInfo()
-			if stable != "Error!" {
-				stat, err = checkForUpdate(stable, beta)
-				if stat || forced {
-					if betaUpdate {
-						downloadUpdate(beta)
-					} else {
-						downloadUpdate(stable)
-					}
-					win.Close()
-					cmd := exec.Command("./LinuxPA")
-					cmd.Stdin = os.Stdin
-					cmd.Stdout = os.Stdout
-					cmd.Start()
-				} else {
-					fmt.Println(err)
-				}
-			} else {
-				fmt.Println("Failed Version File Info")
-			}
-		} else {
-			fmt.Println(err)
-		}
-	}(win, updateWin)
-}

wine.go

@@ -1,101 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"strings"
-
-	"github.com/gotk3/gotk3/gtk"
-	"github.com/mholt/archiver/v3"
-)
-
-const (
-	wineURL = "https://www.playonlinux.com/wine/binaries/phoenicis/staging-linux-amd64/PlayOnLinux-wine-5.20-staging-linux-amd64.tar.gz"
-)
-
-func downloadWine(parent *gtk.Window, cb chan bool) {
-	win, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
-	win.SetTransientFor(parent)
-	win.SetDestroyWithParent(true)
-	win.Connect("destroy", func() {
-		parent.SetSensitive(true)
-	})
-	parent.SetSensitive(false)
-	spin, _ := gtk.SpinnerNew()
-	spin.Start()
-	txt, _ := gtk.LabelNew("Downloading Wine")
-	box, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-	box.SetMarginBottom(10)
-	box.SetMarginEnd(10)
-	box.SetMarginStart(10)
-	box.SetMarginTop(10)
-	box.Add(spin)
-	box.Add(txt)
-	win.Add(box)
-	win.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
-	win.ShowAll()
-	win.Show()
-	go func(win *gtk.Window, txt *gtk.Label) {
-		defer win.Close()
-		wineTar, err := os.Create("PortableApps/LinuxPACom/wine5.20.tar.bz2")
-		if err != nil {
-			fmt.Println(err)
-			cb <- false
-			return
-		}
-		defer wineTar.Close()
-		check := http.Client{
-			CheckRedirect: func(r *http.Request, via []*http.Request) error {
-				r.URL.Opaque = r.URL.Path
-				return nil
-			},
-		}
-		resp, err := check.Get(wineURL)
-		if err != nil {
-			fmt.Println(err)
-			cb <- false
-			return
-		}
-		os.RemoveAll("PortableApps/LinuxPACom/Wine")
-		defer resp.Body.Close()
-		_, err = io.Copy(wineTar, resp.Body)
-		if err != nil {
-			fmt.Println(err)
-			cb <- false
-			return
-		}
-		txt.SetText("Extracting Wine")
-		err = archiver.DefaultTarBz2.Unarchive("PortableApps/LinuxPACom/wine2.5.tar.bz2", "PortableApps/LinuxPACom/Wine")
-		if err != nil {
-			fmt.Println(err)
-			cb <- false
-			return
-		}
-		fil, err := os.Open("PortableApps/LinuxPACom/common.sh")
-		if err != nil {
-			fmt.Println(err)
-			cb <- false
-			return
-		}
-		tmp, err := ioutil.ReadAll(fil)
-		if err != nil {
-			fmt.Println(err)
-			cb <- false
-			return
-		}
-		if !strings.Contains(string(tmp), "export PATH=$PWD/PortableApps/LinuxPACom/Wine/wineversion/2.5/bin:$PATH") {
-			tmp = append(tmp, []byte("\nexport PATH=$PWD/PortableApps/LinuxPACom/Wine/wineversion/2.5/bin:$PATH")...)
-			ioutil.WriteFile("PortableApps/LinuxPACom/common.sh", tmp, 0777)
-			if err != nil {
-				fmt.Println(err)
-				cb <- false
-				return
-			}
-		}
-		cb <- true
-		return
-	}(win, txt)
-}