Merge pull request #343 from shazow/term-bot-nopty

sshd: Terminal.Term() fallback to Env TERM
shazow · Apr 17, 2020 · 6aa7a42 · 6aa7a42
2 parents b9aa7a6 + f113a13
commit 6aa7a42
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/sshd/terminal.go b/sshd/terminal.go
@@ -234,9 +234,13 @@ func (t *Terminal) Env() Env {
 }
 
 // Term returns the terminal string value as set by the pty.
-// If there was no pty request, this is empty.
+// If there was no pty request, it falls back to the TERM value passed in as an
+// Env variable.
 func (t *Terminal) Term() string {
 	t.mu.Lock()
 	defer t.mu.Unlock()
-	return t.term
+	if t.term != "" {
+		return t.term
+	}
+	return Env(t.env).Get("TERM")
 }