From 300c4339093de8ce79fa4fc313d8ff0849a220e4 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Thu, 13 Nov 2025 23:04:55 -0500 Subject: [PATCH] Sync with latest libmutton development version --- go.mod | 6 +----- go.sum | 12 ++---------- mutn.go | 4 ++-- src/cli/copyMenu.go | 4 ++-- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 3d59d5b..f3738af 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.25.4 require ( github.com/charmbracelet/glamour v0.7.0 github.com/rwinkhart/go-boilerplate v0.1.1-0.20251110055016-10ee4f91fcb6 - github.com/rwinkhart/libmutton v0.4.3-0.20251111061450-ac4a86d3a42e + github.com/rwinkhart/libmutton v0.4.3-0.20251114034746-04e1b0dd37d3 golang.org/x/term v0.36.0 ) @@ -31,11 +31,7 @@ require ( github.com/rwinkhart/rcw v0.2.3 // indirect github.com/yuin/goldmark v1.7.13 // indirect github.com/yuin/goldmark-emoji v1.0.6 // indirect - golang.design/x/clipboard v0.7.1 // indirect golang.org/x/crypto v0.43.0 // indirect - golang.org/x/exp/shiny v0.0.0-20251017212417-90e834f514db // indirect - golang.org/x/image v0.32.0 // indirect - golang.org/x/mobile v0.0.0-20251021151156-188f512ec823 // indirect golang.org/x/net v0.45.0 // indirect golang.org/x/sys v0.38.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 571dba3..a2e1314 100644 --- a/go.sum +++ b/go.sum @@ -46,8 +46,8 @@ github.com/rwinkhart/go-highlite v0.1.1 h1:9TxbRhYVfD/3YaEgNk1BtEiZ0t8/5mxDUZqNM github.com/rwinkhart/go-highlite v0.1.1/go.mod h1:mWLMtCWcyV0BG4NeyPyAUGMjPvI0ds6vXmUq89QwBFA= github.com/rwinkhart/go-winio v0.1.0 h1:b72agLW+dETGmhR3VbcbwnStfgKfc5AfgJOXBJDkaHg= github.com/rwinkhart/go-winio v0.1.0/go.mod h1:ZWa7ssZJT30CCDGJ7fk/2SBTq9BIQrrVjrcss0UW2s0= -github.com/rwinkhart/libmutton v0.4.3-0.20251111061450-ac4a86d3a42e h1:y9P09ET5X+jWVDrBvVTHNDdE3qlQVHTQMRC7ghP4bBA= -github.com/rwinkhart/libmutton v0.4.3-0.20251111061450-ac4a86d3a42e/go.mod h1:+hO+DEZXR9etMK/8U3kR/R1gIMc+XEPV8iJEN//vBGI= +github.com/rwinkhart/libmutton v0.4.3-0.20251114034746-04e1b0dd37d3 h1:dkPUIG9s8YR2y+Xw3tcJ2ee2FTNemRizfSFuASn2Pjw= +github.com/rwinkhart/libmutton v0.4.3-0.20251114034746-04e1b0dd37d3/go.mod h1:7sMUNpRyYES4Z694TAuzt1MR7Iy4nnVd48uTxcvZeis= github.com/rwinkhart/peercred-mini v0.1.2 h1:4cGWDbv0whvLeVvbUdx84V/9p+2fS+DEXgrA1KxlRFo= github.com/rwinkhart/peercred-mini v0.1.2/go.mod h1:LLHG7YshHEpbpJJP+Il9nx2dnGj5O3VGE32rWmflj0c= github.com/rwinkhart/rcw v0.2.3 h1:g1rVaspZnZM8nWupeSdVO827di4ORMZnczw6iXyo01Y= @@ -62,16 +62,8 @@ github.com/yuin/goldmark v1.7.13 h1:GPddIs617DnBLFFVJFgpo1aBfe/4xcvMc3SB5t/D0pA= github.com/yuin/goldmark v1.7.13/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= github.com/yuin/goldmark-emoji v1.0.6 h1:QWfF2FYaXwL74tfGOW5izeiZepUDroDJfWubQI9HTHs= github.com/yuin/goldmark-emoji v1.0.6/go.mod h1:ukxJDKFpdFb5x0a5HqbdlcKtebh086iJpI31LTKmWuA= -golang.design/x/clipboard v0.7.1 h1:OEG3CmcYRBNnRwpDp7+uWLiZi3hrMRJpE9JkkkYtz2c= -golang.design/x/clipboard v0.7.1/go.mod h1:i5SiIqj0wLFw9P/1D7vfILFK0KHMk7ydE72HRrUIgkg= golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04= golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0= -golang.org/x/exp/shiny v0.0.0-20251017212417-90e834f514db h1:NmsmaSkEAq6A8r0Q78WxD0IygJNCs6J3uYDgNuPkXYM= -golang.org/x/exp/shiny v0.0.0-20251017212417-90e834f514db/go.mod h1:QMAAUorQ8fzCK0C6mr4X4XV9BEp7Al6+jlejJvfYKw4= -golang.org/x/image v0.32.0 h1:6lZQWq75h7L5IWNk0r+SCpUJ6tUVd3v4ZHnbRKLkUDQ= -golang.org/x/image v0.32.0/go.mod h1:/R37rrQmKXtO6tYXAjtDLwQgFLHmhW+V6ayXlxzP2Pc= -golang.org/x/mobile v0.0.0-20251021151156-188f512ec823 h1:M0DtBf/UvJoTH+tk6tgHT2NVxNEJCYhVu1g/xeD+GEk= -golang.org/x/mobile v0.0.0-20251021151156-188f512ec823/go.mod h1:3QSlP0AtP6HPTLbsxfgfefGN76jpIB9yBsMqB8UY37I= golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM= golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q= diff --git a/mutn.go b/mutn.go index 6c8b885..de5c8d3 100644 --- a/mutn.go +++ b/mutn.go @@ -48,7 +48,7 @@ func main() { case "show", "-s": cli.EntryReaderDecrypt(targetLocation, false) case "copy": - err := clip.CopyArgument(targetLocation, 0) + err := clip.CopyShortcut(targetLocation, 0) if err != nil { other.PrintError("Failed to copy password to clipboard: "+err.Error(), global.ErrorClipboard) } @@ -100,7 +100,7 @@ func main() { default: cli.HelpCopy() } - err := clip.CopyArgument(targetLocation, field) + err := clip.CopyShortcut(targetLocation, field) if err != nil { other.PrintError("Failed to copy field to clipboard: "+err.Error(), global.ErrorClipboard) } diff --git a/src/cli/copyMenu.go b/src/cli/copyMenu.go index fa19a43..38993a9 100644 --- a/src/cli/copyMenu.go +++ b/src/cli/copyMenu.go @@ -67,7 +67,7 @@ func CopyMenu(targetLocation string) { fmt.Println(back.AnsiWarning + "[Starting]" + back.AnsiReset + " TOTP clipboard refresher") errorChan := make(chan error) done := make(chan bool) - go clip.TOTPCopier(decSlice[2], 0, errorChan, done) + go clip.TOTPCopier(decSlice[2], errorChan, done) // block until first successful copy err = <-errorChan if err != nil { @@ -84,7 +84,7 @@ func CopyMenu(targetLocation string) { close(done) fmt.Println(back.AnsiBlue + "\n[Stopped]" + back.AnsiReset + " TOTP clipboard refresher") } else { - err := clip.CopyString(true, decSlice[choice]) + err := clip.CopyString(false, decSlice[choice]) if err != nil { other.PrintError("Failed to copy field to clipboard: "+err.Error(), global.ErrorClipboard) }