From 4be7ade52e35c3f9af51c7e4842f96a2f22971a8 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Tue, 7 Oct 2025 19:31:00 -0500 Subject: switch to me.sh.Exit() --- doBuild.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'doBuild.go') diff --git a/doBuild.go b/doBuild.go index 6267b85..0032590 100644 --- a/doBuild.go +++ b/doBuild.go @@ -9,7 +9,6 @@ import ( "path/filepath" "strings" - "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/gitpb" "go.wit.com/log" ) @@ -17,10 +16,10 @@ import ( func doBuild() error { if argv.Build.Install != nil { if err := doInstall(); err != nil { - log.Info("doInstall() failed", err) - badExit(err) + // log.Info("doInstall() failed", err) + me.sh.BadExit("doInstall() failed", err) } - okExit("EVERYTHING BUILT!") + me.sh.GoodExit("EVERYTHING BUILT!") } if argv.Build.MacBuild != nil { @@ -30,7 +29,7 @@ func doBuild() error { if argv.Build.Debian != nil { doBuildDeb() - okExit("") + me.sh.GoodExit("") } return nil @@ -58,7 +57,7 @@ func doInstall() error { me.forge.PrintForgedTable(found) if argv.DryRun { - okExit("") + me.sh.GoodExit("") } me.forge.ConfigRill(16, 16) @@ -67,9 +66,9 @@ func doInstall() error { if stat.Err == nil { continue } - dur := stat.End.Sub(stat.Start) - log.Info("CRAP. INSTALL FAILED", shell.FormatDuration(dur), s, stat.Err) - badExit(stat.Err) + // log.Info("CRAP. INSTALL FAILED", config.FormatDuration(dur), s, stat.Err) + msg := "go install FAILED " + s + me.sh.BadExit(msg, stat.Err) } os.Remove(filepath.Join(me.homedir, "go/bin/forged")) return nil -- cgit v1.2.3