Merge pull request 'Merge pull request 'update-develop' (#26) from update-develop into develop' (#27) from develop into master

Reviewed-on: #27

.gitea/workflows/pull-request-ci.yaml

@@ -19,6 +19,11 @@ jobs:
           check-latest: true
           cache: true
 
+      - name: Setup OS dependencies
+        run: |
+          apt-get update
+          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
+
       - name: Install go dependencies
         run: go mod tidy
 
@@ -90,8 +95,9 @@ jobs:
 
       - name: Build for linux
         run: |
-          fyne package --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}${EXE} main.go
+          fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}
         env:
+          VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
           GOOS: linux
           GOARCH: amd64
@@ -101,17 +107,18 @@ jobs:
 
       - name: Build for windows
         run: |
-          fyne package --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}${EXE} main.go
+          fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}.exe
         env:
+          VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
           GOOS: windows
           GOARCH: amd64
-          EXE: .exe
+          EXE: ".exe"
           CGO_ENABLED: 1
           CC: x86_64-w64-mingw32-gcc
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: swiped-mod-switcher-${{github.ref_name}}
+          name: swiped-mod-switcher-${{github.ref_name}}-${{github.run_number}}
           path: bin/

.gitea/workflows/push-ci.yaml

@@ -20,6 +20,11 @@ jobs:
           check-latest: true
           cache: true
 
+      - name: Setup OS dependencies
+        run: |
+          apt-get update
+          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
+
       - name: Install go dependencies
         run: go mod tidy
 
@@ -91,30 +96,30 @@ jobs:
 
       - name: Build for linux
         run: |
-          fyne package --os ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go
+          fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}
+          ls bin
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
           GOOS: linux
           GOARCH: amd64
-          EXE: ""
           CGO_ENABLED: 1
           CC: gcc
 
       - name: Build for windows
         run: |
-                    fyne package --os ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go
+          fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}.exe
+          ls bin
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
           GOOS: windows
           GOARCH: amd64
-          EXE: .exe
           CGO_ENABLED: 1
           CC: x86_64-w64-mingw32-gcc
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: swiped-mod-switcher-${{github.ref_name}}
+          name: swiped-mod-switcher-${{github.ref_name}}-${{github.run_number}}
           path: bin/

.gitea/workflows/tag-release.yaml

@@ -21,6 +21,11 @@ jobs:
           check-latest: true
           cache: true
 
+      - name: Setup OS dependencies
+        run: |
+          apt-get update
+          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
+
       - name: Install go dependencies
         run: go mod tidy
 
@@ -87,7 +92,7 @@ jobs:
 
       - name: Build for linux
         run: |
-          fyne package --os ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go
+          fyne build --release --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
@@ -97,10 +102,9 @@ jobs:
           CGO_ENABLED: 1
           CC: gcc
 
-
       - name: Build for windows
         run: |
-          fyne package --os ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go
+          fyne build --release --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
@@ -110,7 +114,6 @@ jobs:
           CGO_ENABLED: 1
           CC: x86_64-w64-mingw32-gcc
 
-
       - name: Release binaries
         uses: https://gitea.com/actions/release-action@main
         with:

FyneApp.toml

@@ -1,6 +1,4 @@
 [Details]
-Icon = "icon.png"
-Name = "Swiped Mod Switcher"
-ID = "com.s1d3sw1ped.swipedmodswitcher"
-Version = "0.0.0"
-Build = 1
+  Icon = "icon.png"
+  Name = "Swiped Mod Switcher"
+  ID = "com.s1d3sw1ped.swipedmodswitcher"

main.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"runtime/debug"
 	"s1d3sw1ped/swipedmodswitcher/admin"
 	"slices"
-	"strconv"
 	"strings"
 
 	"fyne.io/fyne/v2"
@@ -61,16 +61,42 @@ var cfg *Config
 
 func main() {
 	if !admin.Admin() {
+		fmt.Println("not running as administrator relaunching")
 		if err := admin.RunSelfElevated(); err != nil {
 			panic(err)
 		}
 		os.Exit(0)
+		return // just incase
 	}
 
 	cfg = loadConfig()
 
 	ap := app.New()
-	wp := ap.NewWindow(ap.Metadata().Name + " v" + ap.Metadata().Version + "." + strconv.Itoa(ap.Metadata().Build))
+
+	commithash := func() string {
+		if info, ok := debug.ReadBuildInfo(); ok {
+			for _, setting := range info.Settings {
+				if setting.Key == "vcs.revision" {
+					return setting.Value
+				}
+			}
+		}
+		return ""
+	}()
+
+	buildversion := ap.Metadata().Custom["BuildVersion"]
+	if buildversion == "" {
+		buildversion = ""
+	}
+
+	buildnumber := ap.Metadata().Custom["BuildNumber"]
+	if buildnumber == "" {
+		buildnumber = "commit " + commithash
+	} else {
+		buildnumber = "build " + buildnumber
+	}
+
+	wp := ap.NewWindow(ap.Metadata().Name + " " + buildversion + " " + buildnumber)
 	wp.Resize(fyne.NewSize(600, 1))
 	wp.CenterOnScreen()
 
@@ -136,10 +162,14 @@ func fillGrid(grid *fyne.Container, parent fyne.Window) {
 	grid.Hide()
 	defer grid.Show()
 	grid.RemoveAll()
+	if admin.Admin() {
 		for _, profile := range profiles {
 			profilename := filepath.Base(profile)
 			grid.Add(widget.NewButton(profilename, makeIFunc(profile, archive, parent)))
 		}
+	} else {
+		grid.Add(widget.NewLabel("not running as administrator"))
+	}
 }
 
 func scanProfiles(profilesroot string) []string {
@@ -181,6 +211,6 @@ func makeIFunc(profile, archive string, parent fyne.Window) func() {
 			return
 		}
 
-		dialog.NewInformation("Success", fmt.Sprintf("filinked files from %s to %s", filepath.Base(profile), archive), parent).Show()
+		dialog.NewInformation("Success", fmt.Sprintf("linked files from %s to %s", filepath.Base(profile), archive), parent).Show()
 	}
 }