lockbox

commit 9d9d6d0967faf9732d24856302881b1b68a6bdbc
parent 62267a955095d070df9905b5dbb1753717273413
Author: Sean Enck <sean@ttypty.com>
Date:   Sat, 15 Oct 2022 15:00:38 -0400

cleaning up stdin area

Diffstat:
M
internal/inputs/stdin.go
 | 
15
+++++----------

1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/internal/inputs/stdin.go b/internal/inputs/stdin.go
@@ -44,7 +44,7 @@ func termEcho(on bool) {
 func GetUserInputPassword(piping, multiLine bool) ([]byte, error) {
 	var password string
 	if !multiLine && !piping {
-		input, err := confirmInputsMatch("password")
+		input, err := confirmInputsMatch()
 		if err != nil {
 			return nil, err
 		}
@@ -62,23 +62,23 @@ func GetUserInputPassword(piping, multiLine bool) ([]byte, error) {
 	return []byte(password), nil
 }
 
-func confirmInputsMatch(object string) (string, error) {
+func confirmInputsMatch() (string, error) {
 	termEcho(false)
 	defer func() {
 		termEcho(true)
 	}()
-	fmt.Printf("please enter %s: ", object)
+	fmt.Print("please enter password: ")
 	first, err := Stdin(true)
 	if err != nil {
 		return "", err
 	}
-	fmt.Printf("\nplease re-enter %s: ", object)
+	fmt.Print("\nplease re-enter password: ")
 	second, err := Stdin(true)
 	if err != nil {
 		return "", err
 	}
 	if first != second {
-		return "", fmt.Errorf("%s(s) do NOT match", object)
+		return "", errors.New("passwords do NOT match")
 	}
 	return first, nil
 }
@@ -108,11 +108,6 @@ func ConfirmYesNoPrompt(prompt string) (bool, error) {
 	return resp == "Y" || resp == "y", nil
 }
 
-// RawStdin will get raw stdin data.
-func RawStdin() ([]byte, error) {
-	return getStdin(false)
-}
-
 func getStdin(one bool) ([]byte, error) {
 	scanner := bufio.NewScanner(os.Stdin)
 	var b bytes.Buffer