mirror of
https://github.com/skoelle/kctl-tui.git
synced 2026-09-18 04:20:25 +00:00
fix: move tool checks before tea.ExecProcess to fix namespace selection
This commit is contained in:
+9
-10
@@ -192,6 +192,14 @@ func (m *fullModel) handleSelect() (tea.Model, tea.Cmd) {
|
||||
|
||||
case screenNamespace:
|
||||
m.selectedNamespace = item.value
|
||||
if err := kubeexec.CheckTool("tmux"); err != nil {
|
||||
m.err = err
|
||||
return m, nil
|
||||
}
|
||||
if err := kubeexec.CheckTool("k9s"); err != nil {
|
||||
m.err = err
|
||||
return m, nil
|
||||
}
|
||||
return m, m.startTmuxSession()
|
||||
}
|
||||
return m, nil
|
||||
@@ -257,15 +265,7 @@ func (m *fullModel) loadNamespacesFor(teamValue string) tea.Cmd {
|
||||
// configured envs, resolved via the context template, so both are
|
||||
// visible side by side.
|
||||
func (m *fullModel) startTmuxSession() tea.Cmd {
|
||||
return func() tea.Msg {
|
||||
if err := kubeexec.CheckTool("tmux"); err != nil {
|
||||
return errMsg{err}
|
||||
}
|
||||
if err := kubeexec.CheckTool("k9s"); err != nil {
|
||||
return errMsg{err}
|
||||
}
|
||||
|
||||
selfPath := "kctl-tui" // resolved via PATH; see README for install instructions
|
||||
selfPath := "kctl-tui"
|
||||
panelCmd := fmt.Sprintf("%s panel --context=%s --ns=%s --team=%s",
|
||||
selfPath, m.selectedContext, m.selectedNamespace, m.selectedTeam)
|
||||
|
||||
@@ -298,7 +298,6 @@ func (m *fullModel) startTmuxSession() tea.Cmd {
|
||||
return tea.ExecProcess(c, func(err error) tea.Msg {
|
||||
return tmuxDoneMsg{err: err}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func (m *fullModel) View() string {
|
||||
|
||||
Reference in New Issue
Block a user