Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 226e9d6210 | |||
| 56748f043e | |||
| 3d3239fe0a | |||
| 6e643b68ac | |||
| 539f33d25e | |||
| 4d3cb9f486 |
@@ -2,10 +2,10 @@
|
||||
LinuxPA is a try to bring a [PortableApps.com](http://portableapps.com) type launcher to Linux.
|
||||
|
||||
# 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 (.sh script files have priority), but if one isn't found it launches the first executable in general.
|
||||
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:
|
||||
Both of the below places provide linux executables that don't need libs installed on the host system:
|
||||
The below place provides linux executables that don't need libs installed on the host system:
|
||||
[AppImage](https://bintray.com/probono/AppImages)
|
||||
|
||||
# PortableApps.com Compatibility
|
||||
@@ -13,23 +13,24 @@ LinuxPA works will with the PortableApps.com launcher, as it looks for apps in t
|
||||
My forum at PortableApps.com can be found [here](http://portableapps.com/node/54998).
|
||||
|
||||
# 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).
|
||||
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
|
||||
Because apps aren't natively formated in the PortableApps.com format, if LinuxPA doesn't find the AppInfo.ini or appicon_\*.png in the App/AppInfo folder of the app it looks for them in the root directory of the app (except it looks, nor for appicon_\*.png, but appicon.png). If an AppInfo.ini file isn't found then the name of the app is grabbed from the folder name and it's category is set to other. It specifically looks for the lines starting with `Name=` and `Category=`
|
||||
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 Website](http://appimage.org)
|
||||
Right now AppImages are simply supported via the native linux executable support, but later I'm hoping to add downloading and automatic updating support later on.
|
||||
Right now AppImages are simply supported via the native linux executable support, and you can download AppImages. (Woo)
|
||||
|
||||
# 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
|
||||
Photos are found [Here](https://goo.gl/photos/VtBUL6DyZTMidj5n6)
|
||||
Photos are found [Here](https://goo.gl/photos/VtBUL6DyZTMidj5n6). The screenshots are with the adapta gtk theme
|
||||
|
||||
# TODO (Might be in order)
|
||||
1. MAKE IT BETTER
|
||||
1. Add updater for .AppImage files
|
||||
1. Download .AppImage files (maybe)
|
||||
1. Check if all apps are closed when it closes and ask if you want to force stop the apps.
|
||||
1. MAKE IT BETTER
|
||||
1. Ask if you want to update / manual update check
|
||||
1. Show change log on update
|
||||
1. Better appimage support in general
|
||||
1. Check if all apps are closed when it closes and ask if you want to force stop the apps
|
||||
|
||||
@@ -25,7 +25,11 @@ type app struct {
|
||||
func (a *app) getTreeIter(store *gtk.TreeStore) *gtk.TreeIter {
|
||||
it := store.Append(nil)
|
||||
store.SetValue(it, 0, a.icon)
|
||||
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 {
|
||||
@@ -48,13 +52,17 @@ func (a *app) launch() {
|
||||
var cmd *exec.Cmd
|
||||
if !contains(a.lin, a.ex[0]) {
|
||||
if comEnbld {
|
||||
cmd = exec.Command("/bin/sh", "-c", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; wine \""+a.ex[0]+"\"")
|
||||
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", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[0]+"\"")
|
||||
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]+"\"")
|
||||
}
|
||||
@@ -64,8 +72,12 @@ func (a *app) launch() {
|
||||
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", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[0]+"\"")
|
||||
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]+"\"")
|
||||
}
|
||||
@@ -78,7 +90,7 @@ func (a *app) launch() {
|
||||
var cmd *exec.Cmd
|
||||
if len(a.lin) == 0 {
|
||||
if comEnbld {
|
||||
cmd = exec.Command("/bin/sh", "-c", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; wine \""+a.ex[0]+"\"")
|
||||
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]+"\"")
|
||||
}
|
||||
@@ -90,8 +102,12 @@ func (a *app) launch() {
|
||||
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", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.lin[ind]+"\"")
|
||||
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]+"\"")
|
||||
}
|
||||
@@ -109,8 +125,12 @@ func (a *app) launch() {
|
||||
}
|
||||
}
|
||||
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", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.lin[ind]+"\"")
|
||||
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]+"\"")
|
||||
}
|
||||
@@ -127,13 +147,17 @@ func (a *app) launchSub(sub int) {
|
||||
var cmd *exec.Cmd
|
||||
if !contains(a.lin, a.ex[sub]) {
|
||||
if comEnbld {
|
||||
cmd = exec.Command("/bin/sh", "-c", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; wine \""+a.ex[sub]+"\"")
|
||||
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", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
|
||||
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]+"\"")
|
||||
}
|
||||
@@ -143,8 +167,12 @@ func (a *app) launchSub(sub int) {
|
||||
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", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
|
||||
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]+"\"")
|
||||
}
|
||||
@@ -179,11 +207,15 @@ func (a *app) edit(parent *gtk.Window, reload func()) {
|
||||
imgBut.SetImage(img)
|
||||
imgBut.SetSizeRequest(100, 100)
|
||||
imgBut.Connect("clicked", func() {
|
||||
fil, _ := gtk.FileChooserDialogNewWith2Buttons("Select Icon", win, gtk.FILE_CHOOSER_ACTION_OPEN, "Cancel", gtk.RESPONSE_CANCEL, "Open", gtk.RESPONSE_ACCEPT)
|
||||
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 == int(gtk.RESPONSE_ACCEPT) {
|
||||
filename := fil.GetFilename()
|
||||
|
||||
+1
-1
@@ -53,7 +53,7 @@ func downloadApp(parent *gtk.Window, ap appimg) {
|
||||
foldName = "PortableApps/" + name
|
||||
} else {
|
||||
os.Mkdir("PortableApps/"+name+"Portable", 0777)
|
||||
foldName = "PortableApps/" + name
|
||||
foldName = "PortableApps/" + name + "Portable"
|
||||
}
|
||||
os.Remove(foldName + "/" + ap.full)
|
||||
fil, err := os.Create(foldName + "/" + ap.full)
|
||||
|
||||
@@ -2,6 +2,7 @@ package main
|
||||
|
||||
import (
|
||||
"encoding/gob"
|
||||
"flag"
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
@@ -9,8 +10,7 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
version = "2.1.1.0"
|
||||
defIni = ""
|
||||
version = "2.1.2.1"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -23,16 +23,19 @@ var (
|
||||
wineAvail bool
|
||||
portableHide bool
|
||||
versionNewest = true
|
||||
paDirs = true
|
||||
)
|
||||
|
||||
func main() {
|
||||
forced := flag.Bool("force-update", false, "Force the update dialog to be shown")
|
||||
flag.Parse()
|
||||
os.MkdirAll("PortableApps/LinuxPACom", 0777)
|
||||
master = make(map[string][]app)
|
||||
linmaster = make(map[string][]app)
|
||||
uiStart()
|
||||
uiStart(*forced)
|
||||
}
|
||||
|
||||
func uiStart() {
|
||||
func uiStart(forced bool) {
|
||||
gtk.Init(nil)
|
||||
setup()
|
||||
win, err := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
|
||||
@@ -49,7 +52,7 @@ func uiStart() {
|
||||
ui(win)
|
||||
win.ShowAll()
|
||||
win.Show()
|
||||
update(win)
|
||||
update(win, forced)
|
||||
gtk.Main()
|
||||
}
|
||||
|
||||
@@ -72,6 +75,10 @@ func savePrefs() {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = enc.Encode(paDirs)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
func loadPrefs() {
|
||||
@@ -92,6 +99,10 @@ func loadPrefs() {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = dec.Decode(&paDirs)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
func contains(arr []string, str string) bool {
|
||||
|
||||
+44
@@ -9,6 +9,10 @@ import (
|
||||
"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)
|
||||
@@ -84,11 +88,17 @@ func settingsUI(parent *gtk.Window, onExit func()) {
|
||||
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()
|
||||
})
|
||||
gnrl.Add(wineLbl)
|
||||
gnrl.Add(dlWine)
|
||||
gnrl.Add(pthdCheck)
|
||||
gnrl.Add(wineCheck)
|
||||
gnrl.Add(versCheck)
|
||||
gnrl.Add(paDirsCheck)
|
||||
ntbk.AppendPage(gnrl, getLabel("General"))
|
||||
com, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
|
||||
com.SetMarginStart(10)
|
||||
@@ -113,8 +123,25 @@ func settingsUI(parent *gtk.Window, onExit func()) {
|
||||
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"))
|
||||
@@ -136,8 +163,25 @@ func settingsUI(parent *gtk.Window, onExit func()) {
|
||||
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)
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"bufio"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"os"
|
||||
"os/exec"
|
||||
@@ -16,6 +17,7 @@ import (
|
||||
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/nmbk318er5kej5h/Changelog?dl=1"
|
||||
)
|
||||
|
||||
//Thanks to https://www.socketloop.com/tutorials/golang-download-file-example
|
||||
@@ -55,6 +57,38 @@ func getVersionFileInfo() string {
|
||||
return string(out)
|
||||
}
|
||||
|
||||
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
|
||||
},
|
||||
}
|
||||
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(new string) (bool, error) {
|
||||
curSlice := strings.Split(version, ".")
|
||||
newSlice := strings.Split(new, ".")
|
||||
@@ -111,13 +145,69 @@ func downloadUpdate(newVersion string) (bool, error) {
|
||||
return true, nil
|
||||
}
|
||||
|
||||
func update(win *gtk.Window) {
|
||||
func update(win *gtk.Window, forced bool) {
|
||||
stat, err := versionDL()
|
||||
if stat {
|
||||
res := getVersionFileInfo()
|
||||
if res != "Error!" {
|
||||
stat, err = checkForUpdate(res)
|
||||
if stat || forced {
|
||||
stat, err = changelogDL()
|
||||
if stat {
|
||||
updateWin, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
|
||||
updateWin.SetTransientFor(win)
|
||||
updateWin.SetPosition(gtk.WIN_POS_CENTER)
|
||||
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.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("Checking for updates")
|
||||
lbl, _ := gtk.LabelNew("Updating")
|
||||
topLvl.Add(spin)
|
||||
topLvl.Add(lbl)
|
||||
topLvl.SetMarginBottom(10)
|
||||
@@ -135,8 +225,7 @@ func update(win *gtk.Window) {
|
||||
res := getVersionFileInfo()
|
||||
if res != "Error!" {
|
||||
stat, err = checkForUpdate(res)
|
||||
if stat {
|
||||
lbl.SetText("Updating!")
|
||||
if stat || forced {
|
||||
downloadUpdate(res)
|
||||
win.Close()
|
||||
cmd := exec.Command("./LinuxPA")
|
||||
|
||||
Reference in New Issue
Block a user