fankes/komari-agent
2
0
Fork 0
mirror of https://github.com/fankes/komari-agent.git synced 2025-10-19 11:09:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: 优化终端进程创建，支持交互模式并添加回退逻辑

Browse Source
This commit is contained in:
Akizon77
2025-06-06 18:20:54 +08:00
parent 4de600f7ce
commit 6e4bd4e4ae
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
terminal/terminal_unix.go
View File

@@ -52,8 +52,8 @@ func newTerminalImpl() (*terminalImpl, error) {
if shell == "" { if shell == "" {
return nil, fmt.Errorf("no supported shell found") return nil, fmt.Errorf("no supported shell found")
} }
// 创建进程 // 创建进程: 优先使用交互模式，如不支持则回退
cmd := exec.Command(shell) cmd := exec.Command(shell, "-i")
cmd.Env = append(os.Environ(), // 继承系统环境变量 cmd.Env = append(os.Environ(), // 继承系统环境变量
"TERM=xterm-256color", "TERM=xterm-256color",
"LANG=C.UTF-8", "LANG=C.UTF-8",
@@ -61,7 +61,17 @@ func newTerminalImpl() (*terminalImpl, error) {
) )
tty, err := pty.Start(cmd) tty, err := pty.Start(cmd)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to start pty: %v", err) // 交互模式不被支持，回退到无 -i 的启动方式
cmd = exec.Command(shell)
cmd.Env = append(os.Environ(),
"TERM=xterm-256color",
"LANG=C.UTF-8",
"LC_ALL=C.UTF-8",
)
tty, err = pty.Start(cmd)
if err != nil {
return nil, fmt.Errorf("failed to start pty with or without -i: %v", err)
}
} }
// 设置初始终端大小 // 设置初始终端大小