From e7ebb9745d524046f7d88dd15d90740e7c552d9f Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 24 Jun 2023 01:38:32 +0300 Subject: [PATCH 1/3] Fix linux/arm64 build job tags --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 456a604..8d8ea06 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,7 @@ linux/arm64: <<: *build-linux image: dock.mau.dev/tulir/gomuks-build-docker:linux-arm64-native tags: + - linux - arm64 windows/amd64: From 2a242c8f26c1ec3abe91e885f7a910f10d773fc2 Mon Sep 17 00:00:00 2001 From: Nilesh Patra Date: Sat, 1 Jul 2023 14:35:25 +0530 Subject: [PATCH 2/3] Make debug dir specific to username to ease off multi user logins --- debug/debug.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/debug/debug.go b/debug/debug.go index cb4587d..625476a 100644 --- a/debug/debug.go +++ b/debug/debug.go @@ -22,6 +22,7 @@ import ( "io" "io/ioutil" "os" + "os/user" "path/filepath" "runtime/debug" "time" @@ -34,7 +35,17 @@ var RecoverPrettyPanic bool var DeadlockDetection bool var WriteLogs bool var OnRecover func() -var LogDirectory = filepath.Join(os.TempDir(), "gomuks") +var LogDirectory = filepath.Join(os.TempDir(), "gomuks-" + getUname()) + +func getUname() string { + currUser, err := user.Current() + if err != nil { + fmt.Println(err) + os.Exit(1) + } + + return currUser.Username +} func Initialize() { err := os.MkdirAll(LogDirectory, 0750) From 253b47b076a7292446554e1bb3980a18c77ddc22 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 1 Jul 2023 14:32:48 +0300 Subject: [PATCH 3/3] Fix lint issue --- debug/debug.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debug/debug.go b/debug/debug.go index 625476a..315d56e 100644 --- a/debug/debug.go +++ b/debug/debug.go @@ -35,7 +35,7 @@ var RecoverPrettyPanic bool var DeadlockDetection bool var WriteLogs bool var OnRecover func() -var LogDirectory = filepath.Join(os.TempDir(), "gomuks-" + getUname()) +var LogDirectory = filepath.Join(os.TempDir(), "gomuks-"+getUname()) func getUname() string { currUser, err := user.Current()