feedback: remove stray '\r' on Windows on interactive input

cmaglie · cmaglie · commit 6db232761c4b · 2023-01-04T11:27:13.000+01:00
diff --git a/internal/cli/feedback/terminal.go b/internal/cli/feedback/terminal.go
@@ -62,7 +62,10 @@ func InputUserField(prompt string, secret bool) (string, error) {
 		fmt.Fprintln(stdOut)
 	} else {
 		value, err = bufio.NewReader(os.Stdin).ReadBytes('\n')
-		if l := len(value); l > 0 {
+		if l := len(value); l > 0 { // Trim \n
+			value = value[:l-1]
+		}
+		if l := len(value); l > 0 && value[l-1] == '\r' { // Trim \r (it happens on Windows)
 			value = value[:l-1]
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,10 @@ func InputUserField(prompt string, secret bool) (string, error) {`
`62`	`62`	`fmt.Fprintln(stdOut)`
`63`	`63`	`} else {`
`64`	`64`	`value, err = bufio.NewReader(os.Stdin).ReadBytes('\n')`
`65`		`- if l := len(value); l > 0 {`
	`65`	`+ if l := len(value); l > 0 { // Trim \n`
	`66`	`+ value = value[:l-1]`
	`67`	`+ }`
	`68`	`+ if l := len(value); l > 0 && value[l-1] == '\r' { // Trim \r (it happens on Windows)`
`66`	`69`	`value = value[:l-1]`
`67`	`70`	`}`
`68`	`71`	`}`