From e15684897d426d341d36de7c03d628396a0fe776 Mon Sep 17 00:00:00 2001 From: Tasos Papalyras Date: Tue, 12 Sep 2023 23:54:26 +0300 Subject: [PATCH] Fix lint errors, add nogui linker flag --- cmd/builder/build.go | 5 +++-- cmd/client/main.go | 4 ++-- src/client/rest/generated/client.gen.go | 2 +- src/client/rest/generated/models.gen.go | 2 +- src/server/rest/generated/client.gen.go | 2 +- src/server/rest/generated/models.gen.go | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cmd/builder/build.go b/cmd/builder/build.go index 6897dc3d..3ec4879a 100644 --- a/cmd/builder/build.go +++ b/cmd/builder/build.go @@ -1,9 +1,10 @@ package main import ( - "github.com/spf13/cobra" "runtime" + "github.com/spf13/cobra" + . "myst/pkg/builder/util" ) @@ -49,7 +50,7 @@ var buildCmd = &cobra.Command{ Step("Building client", func() { if runtime.GOOS == "windows" { - Run("go build -o build/client/client-$GOOS-$GOARCH.exe cmd/client/main.go") + Run("go build -ldflags \"-H=windowsgui\" -o build/client/client-$GOOS-$GOARCH.exe cmd/client/main.go") } else { Run("go build -o build/client/client-$GOOS-$GOARCH cmd/client/main.go") } diff --git a/cmd/client/main.go b/cmd/client/main.go index a0e9c5c5..3dd4913e 100644 --- a/cmd/client/main.go +++ b/cmd/client/main.go @@ -5,6 +5,7 @@ import ( "fmt" "os" "os/signal" + "syscall" "fyne.io/systray" "github.com/namsral/flag" @@ -54,7 +55,7 @@ func main() { } interrupt := make(chan os.Signal, 1) - signal.Notify(interrupt, os.Interrupt, os.Kill) + signal.Notify(interrupt, os.Interrupt, syscall.SIGTERM) done := make(chan bool, 1) @@ -90,7 +91,6 @@ func onReady() { go func() { <-quit.ClickedCh systray.Quit() - return }() } diff --git a/src/client/rest/generated/client.gen.go b/src/client/rest/generated/client.gen.go index 555f1500..bdbe4d7a 100644 --- a/src/client/rest/generated/client.gen.go +++ b/src/client/rest/generated/client.gen.go @@ -1,6 +1,6 @@ // Package generated provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.14.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.15.0 DO NOT EDIT. package generated import ( diff --git a/src/client/rest/generated/models.gen.go b/src/client/rest/generated/models.gen.go index 566bfc81..6ce7520a 100644 --- a/src/client/rest/generated/models.gen.go +++ b/src/client/rest/generated/models.gen.go @@ -1,6 +1,6 @@ // Package generated provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.14.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.15.0 DO NOT EDIT. package generated import ( diff --git a/src/server/rest/generated/client.gen.go b/src/server/rest/generated/client.gen.go index c3c5e0cf..243c000e 100644 --- a/src/server/rest/generated/client.gen.go +++ b/src/server/rest/generated/client.gen.go @@ -1,6 +1,6 @@ // Package generated provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.14.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.15.0 DO NOT EDIT. package generated import ( diff --git a/src/server/rest/generated/models.gen.go b/src/server/rest/generated/models.gen.go index 1d10b8ac..a0775101 100644 --- a/src/server/rest/generated/models.gen.go +++ b/src/server/rest/generated/models.gen.go @@ -1,6 +1,6 @@ // Package generated provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.14.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.15.0 DO NOT EDIT. package generated import (