Turn off terminal echo while progressbar is present.

internal/output/progress.go

@@ -15,6 +15,7 @@ type Spinner struct {
 	stop          chan struct{}
 	interval      time.Duration
 	reportedError bool
+	terminalState *terminalState
 }
 
 var _ Marshaller = &Spinner{}
@@ -28,7 +29,7 @@ func StartSpinner(out Outputer, msg string, interval time.Duration) *Spinner {
 	if out.Config().Interactive {
 		frames = []string{`|`, `/`, `-`, `\`}
 	}
-	d := &Spinner{0, frames, out, make(chan struct{}, 1), interval, false}
+	d := &Spinner{0, frames, out, make(chan struct{}, 1), interval, false, nil}
 
 	if msg != "" && d.out.Type() == PlainFormatName {
 		d.out.Fprint(d.out.Config().ErrWriter, strings.TrimSuffix(msg, " ")+" ")
@@ -39,6 +40,8 @@ func StartSpinner(out Outputer, msg string, interval time.Duration) *Spinner {
 		}()
 	}
 
+	d.turnOffEcho()
+
 	return d
 }
 
@@ -110,6 +113,8 @@ func (d *Spinner) Stop(msg string) {
 	if d.out.Type() == PlainFormatName {
 		d.out.Fprint(d.out.Config().ErrWriter, "\n")
 	}
+
+	d.turnOnEcho()
 }
 
 func (d *Spinner) moveCaretBackInTerminal(n int) {

internal/output/progress_darwin.go

@@ -0,0 +1,6 @@
+package output
+
+import "golang.org/x/sys/unix"
+
+const ioctlReadTermios = unix.TIOCGETA
+const ioctlWriteTermios = unix.TIOCSETA

internal/output/progress_linux.go

@@ -0,0 +1,6 @@
+package output
+
+import "golang.org/x/sys/unix"
+
+const ioctlReadTermios = unix.TCGETS
+const ioctlWriteTermios = unix.TCSETS

internal/output/progress_unix.go

@@ -4,12 +4,49 @@
 package output
 
 import (
+	"os"
+
+	"github.com/ActiveState/cli/internal/multilog"
 	"github.com/ActiveState/cli/internal/rollbar"
+	"golang.org/x/sys/unix"
 )
 
+type terminalState struct {
+	termios *unix.Termios
+}
+
 func (d *Spinner) moveCaretBackInCommandPrompt(n int) {
 	if !d.reportedError {
 		rollbar.Error("Incorrectly detected Windows command prompt in Unix environment")
 		d.reportedError = true
 	}
 }
+
+func (d *Spinner) turnOffEcho() {
+	fd := int(os.Stdin.Fd())
+	termios, err := unix.IoctlGetTermios(fd, ioctlReadTermios)
+	if err != nil {
+		multilog.Error("Could not get termios: %v", err)
+		return
+	}
+
+	newState := *termios // copy
+	newState.Lflag &^= unix.ECHO
+	err = unix.IoctlSetTermios(fd, ioctlWriteTermios, &newState)
+	if err != nil {
+		multilog.Error("Could not set termios: %v", err)
+		return
+	}
+
+	d.terminalState = &terminalState{termios}
+}
+
+func (d *Spinner) turnOnEcho() {
+	if d.terminalState == nil {
+		return
+	}
+	err := unix.IoctlSetTermios(int(os.Stdin.Fd()), ioctlWriteTermios, d.terminalState.termios)
+	if err != nil {
+		multilog.Error("Could not restore termios: %v", err)
+	}
+}

internal/output/progress_win.go

@@ -57,3 +57,34 @@ func (d *Spinner) moveCaretBackInCommandPrompt(n int) {
 		d.reportedError = true
 	}
 }
+
+type terminalState struct {
+	mode uint32
+}
+
+func (d *Spinner) turnOffEcho() {
+	var mode uint32
+	if err := windows.GetConsoleMode(windows.Handle(os.Stdin.Fd()), &mode); err != nil {
+		multilog.Error("Error calling GetConsoleMode: %v", err)
+		return
+	}
+
+	newMode := mode
+	newMode &^= windows.ENABLE_ECHO_INPUT
+	if err := windows.SetConsoleMode(windows.Handle(os.Stdin.Fd()), newMode); err != nil {
+		multilog.Error("Error calling SetConsoleMode: %v", err)
+		return
+	}
+
+	d.terminalState = &terminalState{mode}
+}
+
+func (d *Spinner) turnOnEcho() {
+	if d.terminalState == nil {
+		return
+	}
+	err := windows.SetConsoleMode(windows.Handle(os.Stdin.Fd()), d.terminalState.mode)
+	if err != nil {
+		multilog.Error("Error restoring mode via SetConsoleMode: %v", err)
+	}
+}