Merge pull request 'ci and general changes' (#18) from ci_and_edits into master

Reviewed-on: #18

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

@@ -90,8 +90,10 @@ jobs:
 
       - name: Build for linux
         run: |
-          fyne package --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}${EXE} main.go
+          fyne package --os ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go
+          mv *.tar.xz bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64.tar.xz
         env:
+          VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
           GOOS: linux
           GOARCH: amd64
@@ -101,12 +103,13 @@ jobs:
 
       - name: Build for windows
         run: |
-          fyne package --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}${EXE} main.go
+          fyne package --os ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go
         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
 

.gitea/workflows/push-ci.yaml

@@ -89,15 +89,29 @@ 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 Version=${{VERSION}} --metadata Build=${{BUILD}} -o bin/sw1ped-mod-switcher-${{VERSION#v}}.${{BUILD}}-${{GOOS}}-${{GOARCH}} main.go
-          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 Version=${{VERSION}} --metadata Build=${{BUILD}} -o bin/sw1ped-mod-switcher-${{VERSION#v}}.${{BUILD}}-${{GOOS}}-${{GOARCH}}.exe main.go
+          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

.gitea/workflows/tag-release.yaml

@@ -87,7 +87,8 @@ 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 package --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go
+          mv *.tar.xz bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64.tar.xz
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
@@ -97,10 +98,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 package --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
@@ -110,7 +110,6 @@ jobs:
           CGO_ENABLED: 1
           CC: x86_64-w64-mingw32-gcc
 
-
       - name: Release binaries
         uses: https://gitea.com/actions/release-action@main
         with:

main.go

@@ -63,10 +63,12 @@ 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()
@@ -138,10 +140,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 {