From 926b80709ebaa065b52c0f897ab5e6d45f1da5f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Dorrestijn?= Date: Fri, 20 Nov 2026 11:53:56 +0100 Subject: [PATCH] fix(web): pass -config before web in the login service --- webcmd.go | 5 +++-- webcmd_test.go | 9 +++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/webcmd.go b/webcmd.go index 70e48d1b..8e86227c 100644 --- a/webcmd.go +++ b/webcmd.go @@ -262,12 +262,13 @@ func webAutostart(cfgPath, addr string) *web.Autostart { if abs, err := filepath.Abs(exe); err == nil { exe = abs } - argv := []string{exe, "web", "-no-open", "-addr", addr} + argv := []string{exe} if cfgPath != "" { if abs, err := filepath.Abs(cfgPath); err == nil { - argv = append(argv, "-config", abs) + argv = append(argv, "-config", abs) // a global flag: before the command } } + argv = append(argv, "web", "-no-open", "-addr", addr) return &web.Autostart{Sys: autostart.Default(), Argv: argv, Path: os.Getenv("PATH")} } diff --git a/webcmd_test.go b/webcmd_test.go index 37b9e471..effd3d23 100644 --- a/webcmd_test.go +++ b/webcmd_test.go @@ -146,12 +146,17 @@ func TestRunningWeb(t *testing.T) { } } -// TestWebAutostartArgv: the same address and an absolute -config. +// TestWebAutostartArgv: the same address and an absolute -config, which is +// a global flag: after web, the web command rejects it and the service +// never starts. func TestWebAutostartArgv(t *testing.T) { a := webAutostart("c.yaml", "127.0.0.1:9000") - if a == nil || len(a.Argv) != 7 || !filepath.IsAbs(a.Argv[0]) || strings.Join(a.Argv[1:5], " ") != "web -no-open -addr 127.0.0.1:9000" || !filepath.IsAbs(a.Argv[6]) { + if a == nil || len(a.Argv) != 7 || !filepath.IsAbs(a.Argv[0]) || a.Argv[1] != "-config" || !filepath.IsAbs(a.Argv[2]) || strings.Join(a.Argv[3:], " ") != "web -no-open -addr 127.0.0.1:9000" { t.Errorf("argv = %+v", a) } + if a := webAutostart("", "127.0.0.1:9000"); a == nil || strings.Join(a.Argv[1:], " ") != "web -no-open -addr 127.0.0.1:9000" { + t.Errorf("argv without -config = %+v", a) + } } // TestWebSetupLaneway: on a laneway-server the setup screen starts a