From 72755e91b582dd2f6b93f0aa30992da4dc10750d Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Mon, 19 May 2025 19:58:19 +0000 Subject: [PATCH] Default to "edit" for note editing on Windows; bump libmutton --- go.mod | 7 +++---- go.sum | 14 ++++++-------- src/cli/initWIN.go | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 19785b1..5565783 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/Trojan2021/BEAN v0.0.0-20241210230804-8f294833b514 github.com/charmbracelet/glamour v0.7.0 github.com/rwinkhart/go-boilerplate v0.0.0-20250509173525-20670ec7bb9c - github.com/rwinkhart/libmutton v0.3.2-0.20250512162603-36bbf88690c5 + github.com/rwinkhart/libmutton v0.3.2-0.20250517001120-35d053b46f70 golang.org/x/term v0.32.0 ) @@ -18,7 +18,6 @@ require ( github.com/boombuler/barcode v1.0.2 // indirect github.com/charmbracelet/x/ansi v0.5.2 // indirect github.com/dlclark/regexp2 v1.11.5 // indirect - github.com/fortis/go-steam-totp v0.0.0-20171114202746-18e928674727 // indirect github.com/gorilla/css v1.0.1 // indirect github.com/kr/fs v0.1.0 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect @@ -29,11 +28,11 @@ require ( github.com/muesli/termenv v0.16.0 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/pkg/sftp v1.13.9 // indirect - github.com/pquerna/otp v1.4.1-0.20231130234153-3357de7c0481 // indirect + github.com/pquerna/otp v1.5.0 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/rwinkhart/convertroman v0.2.0 // indirect github.com/rwinkhart/peercred-mini v0.1.0 // indirect - github.com/rwinkhart/rcw v0.1.1 // indirect + github.com/rwinkhart/rcw v0.1.2 // indirect github.com/stretchr/testify v1.8.4 // indirect github.com/yuin/goldmark v1.7.10 // indirect github.com/yuin/goldmark-emoji v1.0.6 // indirect diff --git a/go.sum b/go.sum index bc02cc1..8e5560e 100644 --- a/go.sum +++ b/go.sum @@ -22,8 +22,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ= github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= -github.com/fortis/go-steam-totp v0.0.0-20171114202746-18e928674727 h1:1RkPJqfzrncAuh9xgoslr9OplZskm+VRA9lkucHPQZ4= -github.com/fortis/go-steam-totp v0.0.0-20171114202746-18e928674727/go.mod h1:wRAWHbTlpt0C4kwnKoa42L2Phrv6uIq+c50P2uKpb7I= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= @@ -51,8 +49,8 @@ github.com/pkg/sftp v1.13.9 h1:4NGkvGudBL7GteO3m6qnaQ4pC0Kvf0onSVc9gR3EWBw= github.com/pkg/sftp v1.13.9/go.mod h1:OBN7bVXdstkFFN/gdnHPUb5TE8eb8G1Rp9wCItqjkkA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/pquerna/otp v1.4.1-0.20231130234153-3357de7c0481 h1:FkxbO331O7mS5EJkP+MCi0o2gswh/Aezs+//NmefrR8= -github.com/pquerna/otp v1.4.1-0.20231130234153-3357de7c0481/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= +github.com/pquerna/otp v1.5.0 h1:NMMR+WrmaqXU4EzdGJEE1aUUI0AMRzsp96fFFWNPwxs= +github.com/pquerna/otp v1.5.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= @@ -63,12 +61,12 @@ github.com/rwinkhart/go-boilerplate v0.0.0-20250509173525-20670ec7bb9c h1:RIMnYf github.com/rwinkhart/go-boilerplate v0.0.0-20250509173525-20670ec7bb9c/go.mod h1:cnzIF45I0FCOvE4YIB+26pLCUx2kWyY2llKYZruNaRY= github.com/rwinkhart/go-winio-easy-pipe-handles v0.0.0-20250407031321-96994a0e8410 h1:NhHwFM3Pgm6zRUfFKvi0p5ndjfFbVWsRwmmhyFlG4PE= github.com/rwinkhart/go-winio-easy-pipe-handles v0.0.0-20250407031321-96994a0e8410/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= -github.com/rwinkhart/libmutton v0.3.2-0.20250512162603-36bbf88690c5 h1:/ll+6pzV+ivkUF4RMwMycr5UgSs8lmWkOSgqPOXVEYg= -github.com/rwinkhart/libmutton v0.3.2-0.20250512162603-36bbf88690c5/go.mod h1:oI6wUEZE/IyeO7aLRUA7+UlkulYOVRSiDbB2kuCOyfA= +github.com/rwinkhart/libmutton v0.3.2-0.20250517001120-35d053b46f70 h1:rWbJ7enOYHmSW577dElngGb1vvv2/ef8+H842Y6pvdE= +github.com/rwinkhart/libmutton v0.3.2-0.20250517001120-35d053b46f70/go.mod h1:g3LPWWYn2y8idaS8yFggsO/aBigQb1iopFwfHQCosqE= github.com/rwinkhart/peercred-mini v0.1.0 h1:TiS6u8cEWzW55S9X4iVpU72Iuy/NG6rMUJMtUEVEFLw= github.com/rwinkhart/peercred-mini v0.1.0/go.mod h1:+x4Mxc2veE+YePSOpcUasjimh7n799c1KraLuQwHR20= -github.com/rwinkhart/rcw v0.1.1 h1:ZvWauVTLGnS7y+I8dZEN+J/KTLuPA8wA+lNzTsn9Nuw= -github.com/rwinkhart/rcw v0.1.1/go.mod h1:LQ2/YJFQlkW+JkgrLpZ51NQP/unIEzPTWsLOpOuKdKU= +github.com/rwinkhart/rcw v0.1.2 h1:JFNRx5Uc0VKZMbur05VbZBhfUtOp2KBjZ6UDeaCRYFI= +github.com/rwinkhart/rcw v0.1.2/go.mod h1:LQ2/YJFQlkW+JkgrLpZ51NQP/unIEzPTWsLOpOuKdKU= github.com/rwinkhart/sys-freebsd-13-xucred v0.33.0 h1:W4J4cS0yLMLKuYePFFL2OR8MAYLoHkErJvq9FBBqK70= github.com/rwinkhart/sys-freebsd-13-xucred v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/src/cli/initWIN.go b/src/cli/initWIN.go index cc45383..5b49d2c 100644 --- a/src/cli/initWIN.go +++ b/src/cli/initWIN.go @@ -2,4 +2,4 @@ package cli -const fallbackEditor = "nvim" // since there is no pre-installed CLI editor on Windows, default to the most popular one +const fallbackEditor = "edit" // "edit" is the Microsoft-developed CLI text editor