Revert "Merge pull request #2882 from ActiveState/mitchell/dx-2214-2"

This reverts commit 137a5d7, reversing
changes made to 94b8811.

cmd/state/main.go

@@ -207,13 +207,6 @@ func run(args []string, isInteractive bool, cfg *config.Instance, out output.Out
 
 	// Set up conditional, which accesses a lot of primer data
 	sshell := subshell.New(cfg)
-	if isInteractive {
-		// Disable terminal echo while State Tool is running.
-		// Other than in prompts and subshells (which temporarily re-enable echo), user typing should
-		// not interfere with output (e.g. runtime progress bars).
-		sshell.TurnOffEcho()
-		defer sshell.TurnOnEcho()
-	}
 
 	conditional := constraints.NewPrimeConditional(auth, pj, sshell.Shell())
 	project.RegisterConditional(conditional)

internal/runbits/activation/activation.go

@@ -67,8 +67,6 @@ func ActivateAndWait(
 	if err := ss.Activate(proj, cfg, out); err != nil {
 		return locale.WrapError(err, "error_could_not_activate_subshell", "Could not activate a new subshell.")
 	}
-	ss.TurnOnEcho() // temporarily re-enable echo while the subshell is active
-	defer ss.TurnOffEcho()
 
 	a, err := process.NewActivation(cfg, os.Getpid())
 	if err != nil {

internal/runbits/runtime/progress/progress.go

@@ -7,14 +7,14 @@ import (
 	"sync"
 	"time"
 
+	"github.com/ActiveState/cli/internal/multilog"
 	"github.com/go-openapi/strfmt"
 	"github.com/vbauerster/mpb/v7"
 	"golang.org/x/net/context"
 
 	"github.com/ActiveState/cli/internal/errs"
 	"github.com/ActiveState/cli/internal/locale"
 	"github.com/ActiveState/cli/internal/logging"
-	"github.com/ActiveState/cli/internal/multilog"
 	"github.com/ActiveState/cli/internal/output"
 	"github.com/ActiveState/cli/pkg/platform/runtime/artifact"
 	"github.com/ActiveState/cli/pkg/platform/runtime/setup/events"

internal/subshell/bash/bash.go

@@ -15,7 +15,6 @@ import (
 	"github.com/ActiveState/cli/internal/osutils/user"
 	"github.com/ActiveState/cli/internal/output"
 	"github.com/ActiveState/cli/internal/subshell/sscommon"
-	"github.com/ActiveState/cli/internal/subshell/termecho"
 	"github.com/ActiveState/cli/pkg/project"
 )
 
@@ -220,17 +219,3 @@ func (v *SubShell) IsAvailable() bool {
 	}
 	return fileutils.FileExists(rcFile)
 }
-
-func (v *SubShell) TurnOffEcho() {
-	if runtime.GOOS == "windows" {
-		return // not supported
-	}
-	termecho.Off()
-}
-
-func (v *SubShell) TurnOnEcho() {
-	if runtime.GOOS == "windows" {
-		return // not supported
-	}
-	termecho.On()
-}

internal/subshell/cmd/cmd.go

@@ -12,7 +12,6 @@ import (
 	"github.com/ActiveState/cli/internal/osutils"
 	"github.com/ActiveState/cli/internal/output"
 	"github.com/ActiveState/cli/internal/subshell/sscommon"
-	"github.com/ActiveState/cli/internal/subshell/termecho"
 	"github.com/ActiveState/cli/pkg/project"
 )
 
@@ -204,11 +203,3 @@ func (v *SubShell) IsActive() bool {
 func (v *SubShell) IsAvailable() bool {
 	return runtime.GOOS == "windows"
 }
-
-func (v *SubShell) TurnOffEcho() {
-	termecho.Off()
-}
-
-func (v *SubShell) TurnOnEcho() {
-	termecho.On()
-}

internal/subshell/fish/fish.go

@@ -5,7 +5,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 
 	"github.com/ActiveState/cli/internal/constants"
 	"github.com/ActiveState/cli/internal/errs"
@@ -15,7 +14,6 @@ import (
 	"github.com/ActiveState/cli/internal/osutils/user"
 	"github.com/ActiveState/cli/internal/output"
 	"github.com/ActiveState/cli/internal/subshell/sscommon"
-	"github.com/ActiveState/cli/internal/subshell/termecho"
 	"github.com/ActiveState/cli/pkg/project"
 )
 
@@ -197,17 +195,3 @@ func (v *SubShell) IsAvailable() bool {
 	}
 	return fileutils.FileExists(rcFile)
 }
-
-func (v *SubShell) TurnOffEcho() {
-	if runtime.GOOS == "windows" {
-		return // not supported
-	}
-	termecho.Off()
-}
-
-func (v *SubShell) TurnOnEcho() {
-	if runtime.GOOS == "windows" {
-		return // not supported
-	}
-	termecho.On()
-}

internal/subshell/subshell.go

@@ -84,12 +84,6 @@ type SubShell interface {
 
 	// IsAvailable returns whether the shell is available on the system
 	IsAvailable() bool
-
-	// TurnOffEcho turns off input echoing.
-	TurnOffEcho()
-
-	// TurnOnEcho turns on input echoing.
-	TurnOnEcho()
 }
 
 // New returns the subshell relevant to the current process, but does not activate it

internal/subshell/tcsh/tcsh.go

@@ -4,7 +4,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 
 	"github.com/ActiveState/cli/internal/errs"
 	"github.com/ActiveState/cli/internal/fileutils"
@@ -14,7 +13,6 @@ import (
 	"github.com/ActiveState/cli/internal/osutils/user"
 	"github.com/ActiveState/cli/internal/output"
 	"github.com/ActiveState/cli/internal/subshell/sscommon"
-	"github.com/ActiveState/cli/internal/subshell/termecho"
 	"github.com/ActiveState/cli/pkg/project"
 )
 
@@ -191,17 +189,3 @@ func (v *SubShell) IsAvailable() bool {
 	}
 	return fileutils.FileExists(rcFile)
 }
-
-func (v *SubShell) TurnOffEcho() {
-	if runtime.GOOS == "windows" {
-		return // not supported
-	}
-	termecho.Off()
-}
-
-func (v *SubShell) TurnOnEcho() {
-	if runtime.GOOS == "windows" {
-		return // not supported
-	}
-	termecho.On()
-}

internal/subshell/zsh/zsh.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 	"strings"
 
 	"github.com/ActiveState/cli/internal/constants"
@@ -19,7 +18,6 @@ import (
 	"github.com/ActiveState/cli/internal/osutils/user"
 	"github.com/ActiveState/cli/internal/output"
 	"github.com/ActiveState/cli/internal/subshell/sscommon"
-	"github.com/ActiveState/cli/internal/subshell/termecho"
 	"github.com/ActiveState/cli/pkg/project"
 )
 
@@ -241,17 +239,3 @@ func (v *SubShell) IsAvailable() bool {
 	}
 	return fileutils.FileExists(rcFile)
 }
-
-func (v *SubShell) TurnOffEcho() {
-	if runtime.GOOS == "windows" {
-		return // not supported
-	}
-	termecho.Off()
-}
-
-func (v *SubShell) TurnOnEcho() {
-	if runtime.GOOS == "windows" {
-		return // not supported
-	}
-	termecho.On()
-}