mirror of
https://github.com/skoelle/kctl-tui.git
synced 2026-09-18 04:20:25 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ffbf4341fa | ||
|
|
37be0707ad | ||
|
|
9e6acdedc2 |
+25
-19
@@ -280,35 +280,41 @@ func (m *fullModel) startTmuxSession() tea.Cmd {
|
||||
ctxA := m.cfg.ResolveContext(envA, m.selectedContext)
|
||||
k9sCmdA := fmt.Sprintf("k9s --context %s -n %s", ctxA, m.selectedNamespace)
|
||||
|
||||
// Kill stale session first (ignore error if none exists).
|
||||
killErr := exec.Command("tmux", "kill-session", "-t", "kctl").Run()
|
||||
fmt.Fprintf(os.Stderr, "[debug] selfPath=%s\n", selfPath)
|
||||
fmt.Fprintf(os.Stderr, "[debug] panelCmd=%s\n", panelCmd)
|
||||
fmt.Fprintf(os.Stderr, "[debug] kill-session err=%v\n", killErr)
|
||||
kubeexec.VerboseLog("[debug] selfPath=%s\n", selfPath)
|
||||
kubeexec.VerboseLog("[debug] panelCmd=%s\n", panelCmd)
|
||||
kubeexec.VerboseLog("[debug] k9sCmdA=%s\n", k9sCmdA)
|
||||
|
||||
args := []string{
|
||||
"new-session", "-d", "-s", "kctl",
|
||||
panelCmd, ";",
|
||||
"set-option", "-t", "kctl", "remain-on-exit", "on", ";",
|
||||
"split-window", "-v", "-t", "kctl:0.0", k9sCmdA, ";",
|
||||
// Kill stale session first (ignore error if none exists).
|
||||
exec.Command("tmux", "kill-session", "-t", "kctl").Run()
|
||||
|
||||
// Run setup commands individually — this avoids the ; separator
|
||||
// issue on Windows where psmux doesn't handle chained args.
|
||||
setup := [][]string{
|
||||
{"new-session", "-d", "-s", "kctl", panelCmd},
|
||||
{"set-option", "-t", "kctl", "remain-on-exit", "on"},
|
||||
{"split-window", "-v", "-t", "kctl:0.0", k9sCmdA},
|
||||
}
|
||||
if len(m.cfg.Envs) > 1 {
|
||||
envB := m.cfg.Envs[1]
|
||||
ctxB := m.cfg.ResolveContext(envB, m.selectedContext)
|
||||
k9sCmdB := fmt.Sprintf("k9s --context %s -n %s", ctxB, m.selectedNamespace)
|
||||
args = append(args,
|
||||
"split-window", "-v", "-t", "kctl:0.1", k9sCmdB, ";",
|
||||
)
|
||||
kubeexec.VerboseLog("[debug] k9sCmdB=%s\n", k9sCmdB)
|
||||
setup = append(setup, []string{"split-window", "-v", "-t", "kctl:0.1", k9sCmdB})
|
||||
}
|
||||
args = append(args,
|
||||
"select-layout", "-t", "kctl", "even-vertical", ";",
|
||||
"select-pane", "-t", "kctl:0.0", ";",
|
||||
"attach", "-t", "kctl",
|
||||
setup = append(setup,
|
||||
[]string{"select-layout", "-t", "kctl", "even-vertical"},
|
||||
[]string{"select-pane", "-t", "kctl:0.0"},
|
||||
)
|
||||
|
||||
fmt.Fprintf(os.Stderr, "[debug] tmux args: %v\n", args)
|
||||
c := exec.Command("tmux", args...)
|
||||
for _, args := range setup {
|
||||
if out, err := exec.Command("tmux", args...).CombinedOutput(); err != nil {
|
||||
kubeexec.VerboseLog("[debug] tmux %s failed: %v\n%s\n", args[0], err, out)
|
||||
return func() tea.Msg { return tmuxDoneMsg{err: fmt.Errorf("tmux %s: %w", args[0], err)} }
|
||||
}
|
||||
}
|
||||
|
||||
// Only attach uses tea.ExecProcess so it takes over the terminal.
|
||||
c := exec.Command("tmux", "attach", "-t", "kctl")
|
||||
return tea.ExecProcess(c, func(err error) tea.Msg {
|
||||
return tmuxDoneMsg{err: err}
|
||||
})
|
||||
|
||||
@@ -29,6 +29,16 @@ func SetVerbose(enabled bool, w io.Writer) {
|
||||
}
|
||||
}
|
||||
|
||||
// VerboseLog writes a message to the verbose log if enabled.
|
||||
func VerboseLog(format string, args ...interface{}) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
if !verbose {
|
||||
return
|
||||
}
|
||||
fmt.Fprintf(logOut, format, args...)
|
||||
}
|
||||
|
||||
func logCmd(name string, args ...string) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
|
||||
Reference in New Issue
Block a user