From 1d6ea8120552665072f5044a004128e7dbbf3a64 Mon Sep 17 00:00:00 2001 From: Ophestra Umiker Date: Sun, 27 Oct 2024 00:46:15 +0900 Subject: shim: user switcher process management struct This change moves all user switcher and shim management to the shim package and withholds output while shim is alive. This also eliminated all exit scenarios where revert is skipped. Signed-off-by: Ophestra Umiker --- main.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 3883eff4..7bb7ffe6 100644 --- a/main.go +++ b/main.go @@ -53,15 +53,18 @@ func main() { tryState() // invoke app - r := 1 a, err := app.New(os) if err != nil { fmsg.Fatalf("cannot create app: %s\n", err) } else if err = a.Seal(loadConfig()); err != nil { - logBaseError(err, "fortify: cannot seal app:") + logBaseError(err, "cannot seal app:") } else if err = a.Start(); err != nil { - logBaseError(err, "fortify: cannot start app:") - } else if r, err = a.Wait(); err != nil { + logBaseError(err, "cannot start app:") + } + + var r int + // wait must be called regardless of result of start + if r, err = a.Wait(); err != nil { if r < 1 { r = 1 } @@ -70,5 +73,5 @@ func main() { if err = a.WaitErr(); err != nil { fmsg.Println("inner wait failed:", err) } - os.Exit(r) + fmsg.Exit(r) } -- cgit v1.3.1