Restore terminal state on exit (#13382)

gravitational · Jun 24, 2022 · ccf6c49 · ccf6c49
1 parent 984d2f4
commit ccf6c49
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/tool/tsh/tsh.go b/tool/tsh/tsh.go
@@ -60,6 +60,7 @@ import (
 	"github.com/gravitational/teleport/lib/sshutils/x11"
 	"github.com/gravitational/teleport/lib/tlsca"
 	"github.com/gravitational/teleport/lib/utils"
+	"github.com/gravitational/teleport/lib/utils/prompt"
 
 	"github.com/gravitational/kingpin"
 	"github.com/gravitational/trace"
@@ -363,7 +364,10 @@ func main() {
 	default:
 		cmdLine = cmdLineOrig
 	}
-	if err := Run(cmdLine); err != nil {
+
+	err := Run(cmdLine)
+	prompt.NotifyExit() // Allow prompt to restore terminal state on exit.
+	if err != nil {
 		var exitError *exitCodeError
 		if errors.As(err, &exitError) {
 			os.Exit(exitError.code)