fix typo in tag-release

Reviewed-on: #26

.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

@@ -6,7 +6,7 @@ on:
 jobs:
   lint:
     name: Lint
-    env: 
+    env:
       RUNNER_TOOL_CACHE: /toolcache
     runs-on: ubuntu-latest
     steps:
@@ -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
 
@@ -89,18 +94,32 @@ jobs:
         run: |
           go mod tidy
 
-      - name: Build
+      - name: Build for linux
         run: |
-          GOOS=linux GOARCH=amd64 CGO_ENABLED=1 CC=gcc fyne package -os=linux -appBuild=${BUILD} -exe bin/swiped-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}
-          cp *.tar.xz bin/
+          ls bin
-          GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc fyne package -os=windows -appBuild=${BUILD} -exe bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go
-          ls
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
+          GOOS: linux
+          GOARCH: amd64
+          CGO_ENABLED: 1
+          CC: gcc
+
+      - name: Build for windows
+        run: |
+          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
+          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,10 +114,15 @@ jobs:
           CGO_ENABLED: 1
           CC: x86_64-w64-mingw32-gcc
 
-
+      - name: Upload artifact
-      - name: Release binaries
+        uses: actions/upload-artifact@v3
-        uses: https://gitea.com/actions/release-action@main
         with:
-          files: |-
+          name: swiped-mod-switcher-${{github.ref_name}}-${{github.run_number}}
-            bin/**
+          path: bin/
-          api_key: '${{secrets.RELEASE_TOKEN}}'
+
+      # - name: Release binaries
+      #   uses: https://gitea.com/actions/release-action@main
+      #   with:
+      #     files: |-
+      #       bin/**
+      #     api_key: '${{secrets.RELEASE_TOKEN}}'

FyneApp.toml

@@ -2,5 +2,3 @@
   Icon = "icon.png"
   Name = "Swiped Mod Switcher"
   ID = "com.s1d3sw1ped.swipedmodswitcher"
-  Version = "0.0.0"
-  Build = 2

main.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"runtime/debug"
 	"s1d3sw1ped/swipedmodswitcher/admin"
 	"slices"
-	"strconv"
 	"strings"
 
 	"fyne.io/fyne/v2"
@@ -18,8 +18,6 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
-var Version = ""
-
 type Config struct {
 	ModProfilesDirectory string `yaml:"mod_profiles_dir"`
 	GameModsDirectory    string `yaml:"game_mods_dir"`
@@ -63,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()
 
@@ -138,9 +162,13 @@ func fillGrid(grid *fyne.Container, parent fyne.Window) {
 	grid.Hide()
 	defer grid.Show()
 	grid.RemoveAll()
-	for _, profile := range profiles {
+	if admin.Admin() {
-		profilename := filepath.Base(profile)
+		for _, profile := range profiles {
-		grid.Add(widget.NewButton(profilename, makeIFunc(profile, archive, parent)))
+			profilename := filepath.Base(profile)
+			grid.Add(widget.NewButton(profilename, makeIFunc(profile, archive, parent)))
+		}
+	} else {
+		grid.Add(widget.NewLabel("not running as administrator"))
 	}
 }
 
@@ -183,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()
 	}
 }