mirror of
https://github.com/kovidgoyal/kitty.git
synced 2026-05-13 08:26:56 +00:00
Fix #8361
This commit is contained in:
parent
448e97549b
commit
9068d3f925
1 changed files with 8 additions and 14 deletions
|
|
@ -3,8 +3,8 @@
|
|||
package ssh
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"io"
|
||||
"os/exec"
|
||||
"regexp"
|
||||
"strconv"
|
||||
|
|
@ -37,19 +37,13 @@ var SSHOptions = sync.OnceValue(func() (ssh_options map[string]string) {
|
|||
}
|
||||
}()
|
||||
cmd := exec.Command(SSHExe())
|
||||
stderr, err := cmd.StderrPipe()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
if err = cmd.Start(); err != nil {
|
||||
return
|
||||
}
|
||||
raw, err := io.ReadAll(stderr)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
text := utils.UnsafeBytesToString(raw)
|
||||
if strings.Contains(text, "OpenSSL version mismatch.") {
|
||||
var stdout, stderr bytes.Buffer
|
||||
cmd.Stdout = &stdout
|
||||
cmd.Stderr = &stderr
|
||||
_ = cmd.Run()
|
||||
|
||||
text := stderr.String()
|
||||
if text == "" || strings.Contains(text, "OpenSSL version mismatch.") {
|
||||
// https://bugzilla.mindrot.org/show_bug.cgi?id=3548
|
||||
return
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue