From 5acb7e47bf18a21fa25e93537c07b9a031aa9e7b Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Sun, 11 May 2025 00:30:24 -0400 Subject: [PATCH] Simplify sanity check file generation --- go.mod | 2 +- go.sum | 4 ++-- src/cli/init.go | 9 ++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 2399f19..1fd3842 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-20250509154735-0846290a7620 - github.com/rwinkhart/libmutton v0.3.2-0.20250509161203-03c040b373b6 + github.com/rwinkhart/libmutton v0.3.2-0.20250511042843-491392562a33 golang.org/x/term v0.32.0 ) diff --git a/go.sum b/go.sum index 800a0bc..dae3390 100644 --- a/go.sum +++ b/go.sum @@ -63,8 +63,8 @@ github.com/rwinkhart/go-boilerplate v0.0.0-20250509154735-0846290a7620 h1:MjxVq+ github.com/rwinkhart/go-boilerplate v0.0.0-20250509154735-0846290a7620/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.20250509161203-03c040b373b6 h1:sV+cBjbQHX1++LrmGpcJ3+QOF6SYJDfPNuIywzqHK10= -github.com/rwinkhart/libmutton v0.3.2-0.20250509161203-03c040b373b6/go.mod h1:qUMh7UidlnhcAyLEygYV8z87le46MnL71r8b6MvJL4w= +github.com/rwinkhart/libmutton v0.3.2-0.20250511042843-491392562a33 h1:EwJJ1JHgxZA68hjpDBrd3aTHw5KAkFYUXX/skqLhiO0= +github.com/rwinkhart/libmutton v0.3.2-0.20250511042843-491392562a33/go.mod h1:khh6CwvbL+4Q/LrhnnyT+n4af7o0TdrnSuRK863Ctj4= github.com/rwinkhart/peercred-mini v0.0.0-20250407033241-c09add2eceea h1:VE2ti/AE4Y3kgnyK+J5c5hpddE+dKHpsFch3K2R6puQ= github.com/rwinkhart/peercred-mini v0.0.0-20250407033241-c09add2eceea/go.mod h1:t+YkvAdnTKTrg4d469tw3K+GCUzX/Bja4h8yKjSIsGs= github.com/rwinkhart/rcw v0.0.0-20250508234041-b49d9f1eea42 h1:/vsBCwHP22cmqrtjsRB1OcPcb+sckktdeFlHKmhzD54= diff --git a/src/cli/init.go b/src/cli/init.go index c8def0a..72901c1 100644 --- a/src/cli/init.go +++ b/src/cli/init.go @@ -60,15 +60,14 @@ func TempInitCli() { core.WriteConfig([][3]string{{"MUTN", "textEditor", textEditor}}, nil, false) } // RCW sanity check file - var passphraseInput1 []byte + var passphrase []byte for { - passphraseInput1 = front.InputHidden("New master (RCW) passphrase:") - passphraseInput2 := front.InputHidden("Confirm RCW passphrase:") - if !bytes.Equal(passphraseInput1, passphraseInput2) { + passphrase = front.InputHidden("Master passphrase:") + if !bytes.Equal(passphrase, front.InputHidden("Confirm master passphrase:")) { fmt.Println(back.AnsiError + "Passphrases do not match" + back.AnsiReset) continue } - core.RCWSanityCheckGen(passphraseInput1) + core.RCWSanityCheckGen(passphrase) break } }