[FIX] Installer self update.

Author: Seiger

cmd/evo/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"flag"
 	"fmt"
 	"os"
@@ -226,10 +227,54 @@ func runTUI(ctx context.Context, mode ui.Mode, installOpt *installengine.Options
 	defer cancel()
 	engine.Run(engineCtx, events, actions)
 
-	if err := ui.RunWithCancel(ctx, mode, events, actions, ui.Meta{
+	res, err := ui.RunWithCancel(ctx, mode, events, actions, ui.Meta{
 		Version: Version,
 		Tagline: "The world’s fastest CMS!",
-	}, cancel); err != nil {
+	}, cancel)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, err)
+		return 1
+	}
+
+	if len(res.PostExecCommand) > 0 {
+		return runPostExec(ctx, res.PostExecCommand)
+	}
+	return 0
+}
+
+func runPostExec(ctx context.Context, argv []string) int {
+	if len(argv) == 0 || strings.TrimSpace(argv[0]) == "" {
+		return 0
+	}
+
+	run := func(cmd []string) error {
+		c := exec.CommandContext(ctx, cmd[0], cmd[1:]...)
+		c.Stdin = os.Stdin
+		c.Stdout = os.Stdout
+		c.Stderr = os.Stderr
+		return c.Run()
+	}
+
+	if err := run(argv); err != nil {
+		var exitErr *exec.ExitError
+		if errors.As(err, &exitErr) {
+			return exitErr.ExitCode()
+		}
+
+		// If we failed to execute a script directly (no shebang support / not executable),
+		// retry via `php <script> ...`.
+		if errors.Is(err, syscall.ENOEXEC) || errors.Is(err, syscall.EACCES) {
+			phpArgv := append([]string{"php", argv[0]}, argv[1:]...)
+			if err2 := run(phpArgv); err2 != nil {
+				if errors.As(err2, &exitErr) {
+					return exitErr.ExitCode()
+				}
+				fmt.Fprintln(os.Stderr, err2)
+				return 1
+			}
+			return 0
+		}
+
 		fmt.Fprintln(os.Stderr, err)
 		return 1
 	}

internal/domain/event.go

@@ -5,14 +5,15 @@ import "time"
 type EventType string
 
 const (
-	EventStepStart EventType = "step_start"
-	EventStepDone  EventType = "step_done"
-	EventProgress  EventType = "progress"
-	EventLog       EventType = "log"
-	EventSteps     EventType = "steps"
+	EventStepStart    EventType = "step_start"
+	EventStepDone     EventType = "step_done"
+	EventProgress     EventType = "progress"
+	EventLog          EventType = "log"
+	EventSteps        EventType = "steps"
 	EventSystemStatus EventType = "system_status"
-	EventWarning   EventType = "warning"
-	EventError     EventType = "error"
+	EventWarning      EventType = "warning"
+	EventError        EventType = "error"
+	EventExecRequest  EventType = "exec_request"
 )
 
 type Severity string
@@ -65,3 +66,10 @@ type StepsPayload struct {
 type SystemStatusEventPayload struct {
 	SystemStatus SystemStatus
 }
+
+// ExecRequestPayload requests that the UI quits and then launches a command after
+// Bubble Tea restores the terminal state.
+type ExecRequestPayload struct {
+	// Command is an argv-style slice: Command[0] is the executable, the rest are args.
+	Command []string
+}

internal/engine/install/engine.go

@@ -13,6 +13,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"regexp"
+	"runtime"
 	"strings"
 	"sync"
 	"time"
@@ -1492,7 +1493,7 @@ func (e *Engine) maybeOfferSelfUpdate(ctx context.Context, emit func(domain.Even
 		tag = "v" + info.HighestVersion
 	}
 
-	cmdStr := "go install github.com/evolution-cms/installer/cmd/evo@" + tag
+	cmdStr := "evo self-update"
 
 	_ = emit(domain.Event{
 		Type:     domain.EventLog,
@@ -1519,9 +1520,14 @@ func (e *Engine) maybeOfferSelfUpdate(ctx context.Context, emit func(domain.Even
 
 	updateEnabled := true
 	reason := ""
-	if _, lookErr := exec.LookPath("go"); lookErr != nil {
+	bootstrapper, bootErr := findPHPBootstrapperEntry()
+	if bootErr != nil || strings.TrimSpace(bootstrapper) == "" {
 		updateEnabled = false
-		reason = "Go not found in PATH"
+		if bootErr != nil {
+			reason = bootErr.Error()
+		} else {
+			reason = "PHP bootstrapper not found"
+		}
 	}
 
 	choice, okSel := askSelect(ctx, emit, actions, stepID, domain.QuestionState{
@@ -1545,33 +1551,25 @@ func (e *Engine) maybeOfferSelfUpdate(ctx context.Context, emit func(domain.Even
 		Source:   "install",
 		Severity: domain.SeverityInfo,
 		Payload: domain.LogPayload{
-			Message: "Updating installer…",
+			Message: "Exiting installer and running: " + cmdStr,
 		},
 	})
 
-	cmd := exec.CommandContext(ctx, "go", "install", "github.com/evolution-cms/installer/cmd/evo@"+tag)
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		_ = emit(domain.Event{
-			Type:     domain.EventWarning,
-			StepID:   stepID,
-			Source:   "install",
-			Severity: domain.SeverityWarn,
-			Payload: domain.LogPayload{
-				Message: "Self-update failed; continuing installation.",
-				Fields:  map[string]string{"error": err.Error(), "output": strings.TrimSpace(string(out))},
-			},
-		})
+	if !updateEnabled {
 		return false
 	}
 
+	cmd := []string{bootstrapper, "self-update"}
+	if runtime.GOOS == "windows" {
+		cmd = []string{"php", bootstrapper, "self-update"}
+	}
 	_ = emit(domain.Event{
-		Type:     domain.EventLog,
+		Type:     domain.EventExecRequest,
 		StepID:   stepID,
 		Source:   "install",
 		Severity: domain.SeverityInfo,
-		Payload: domain.LogPayload{
-			Message: "✔ Installer updated. Please restart the installer to use the new version.",
+		Payload: domain.ExecRequestPayload{
+			Command: cmd,
 		},
 	})
 

internal/ui/model.go

@@ -63,6 +63,10 @@ type Model struct {
 
 	confirmQuitActive   bool
 	confirmQuitSelected int // 0 = abort, 1 = continue
+
+	// When set by the engine, quit the UI and run this command after the TUI exits.
+	postExecCommand []string
+	quitRequested   bool
 }
 
 func NewModel(ctx context.Context, mode Mode, events <-chan domain.Event, actions chan<- domain.Action, meta Meta, cancel func()) *Model {
@@ -329,6 +333,13 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		}
 		m.applyEvent(msg.Event)
 		m.reflow()
+		if m.quitRequested {
+			// Cancel the engine context (best-effort) and quit the TUI immediately.
+			if m.cancel != nil {
+				m.cancel()
+			}
+			return m, tea.Quit
+		}
 		return m, waitForEvent(m.events)
 
 	default:
@@ -356,6 +367,11 @@ func (m *Model) requestCancel(key string) {
 
 func (m *Model) applyEvent(ev domain.Event) {
 	switch ev.Type {
+	case domain.EventExecRequest:
+		if p, ok := ev.Payload.(domain.ExecRequestPayload); ok && len(p.Command) > 0 {
+			m.postExecCommand = append([]string(nil), p.Command...)
+			m.quitRequested = true
+		}
 	case domain.EventSteps:
 		switch p := ev.Payload.(type) {
 		case domain.StepsPayload:

internal/ui/run.go

@@ -14,11 +14,16 @@ import (
 	"github.com/evolution-cms/installer/internal/domain"
 )
 
+type RunResult struct {
+	PostExecCommand []string
+}
+
 func Run(ctx context.Context, mode Mode, events <-chan domain.Event, meta Meta) error {
-	return RunWithCancel(ctx, mode, events, nil, meta, nil)
+	_, err := RunWithCancel(ctx, mode, events, nil, meta, nil)
+	return err
 }
 
-func RunWithCancel(ctx context.Context, mode Mode, events <-chan domain.Event, actions chan<- domain.Action, meta Meta, cancel func()) error {
+func RunWithCancel(ctx context.Context, mode Mode, events <-chan domain.Event, actions chan<- domain.Action, meta Meta, cancel func()) (RunResult, error) {
 	in := os.Stdin
 	out := os.Stdout
 	var tty *os.File
@@ -55,8 +60,12 @@ func RunWithCancel(ctx context.Context, mode Mode, events <-chan domain.Event, a
 	m.reflow()
 
 	p := tea.NewProgram(m, tea.WithAltScreen(), tea.WithInput(in), tea.WithOutput(out))
-	_, err := p.Run()
-	return err
+	finalModel, err := p.Run()
+	res := RunResult{}
+	if mm, ok := finalModel.(*Model); ok && len(mm.postExecCommand) > 0 {
+		res.PostExecCommand = append([]string(nil), mm.postExecCommand...)
+	}
+	return res, err
 }
 
 func configureTerminalOutput(out *os.File) {