From 10bd3b47e9658d2cf78c9bd98f74ccf86783b14c Mon Sep 17 00:00:00 2001 From: bitraid Date: Sat, 12 Oct 2024 13:51:24 +0300 Subject: [PATCH 1/2] clipboard copy: don't run clip through cmd on Windows --- src/croc/croc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/croc/croc.go b/src/croc/croc.go index e5e03c918..0b60b7469 100644 --- a/src/croc/croc.go +++ b/src/croc/croc.go @@ -2129,7 +2129,7 @@ func copyToClipboard(str string) { var cmd *exec.Cmd switch runtime.GOOS { case "windows": - cmd = exec.Command("cmd", "/c", "clip") + cmd = exec.Command("clip") case "darwin": cmd = exec.Command("pbcopy") case "linux": From 1adf84528498671ad48451a706981259ad5f1333 Mon Sep 17 00:00:00 2001 From: bitraid Date: Sat, 12 Oct 2024 14:53:48 +0300 Subject: [PATCH 2/2] clipboard copy: add Linux/Wayland support --- src/croc/croc.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/croc/croc.go b/src/croc/croc.go index 0b60b7469..f46bff58f 100644 --- a/src/croc/croc.go +++ b/src/croc/croc.go @@ -2133,7 +2133,11 @@ func copyToClipboard(str string) { case "darwin": cmd = exec.Command("pbcopy") case "linux": - cmd = exec.Command("xclip", "-selection", "clipboard") + if os.Getenv("XDG_SESSION_TYPE") == "wayland" { + cmd = exec.Command("wl-copy") + } else { + cmd = exec.Command("xclip", "-selection", "clipboard") + } default: return }