From c275e6e12cfef44c05d30081c0330109b07594c9 Mon Sep 17 00:00:00 2001 From: Kevin Franklin Kim Date: Tue, 30 Jul 2024 15:31:42 +0200 Subject: [PATCH] refactor: error handling --- integration/ownbrew/ownbrew.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/integration/ownbrew/ownbrew.go b/integration/ownbrew/ownbrew.go index d6d0811..45c1cc4 100644 --- a/integration/ownbrew/ownbrew.go +++ b/integration/ownbrew/ownbrew.go @@ -140,11 +140,11 @@ func (o *Ownbrew) Install(ctx context.Context) error { if install { if pkg.Tap == "" { if err := o.installLocal(ctx, pkg); err != nil { - return errors.Wrapf(err, "failed to install local tap: %s", pkg.String()) + return errors.Wrap(err, "failed to install local tap") } } else { if err := o.installRemote(ctx, pkg); err != nil { - return errors.Wrapf(err, "failed to install remote tap: %s", pkg.String()) + return errors.Wrap(err, "failed to install remote tap") } } } else { @@ -236,7 +236,7 @@ func (o *Ownbrew) cellarFilename(name, version string) (string, error) { func (o *Ownbrew) installLocal(ctx context.Context, pkg Package) error { filename := filepath.Join(o.tapDir, pkg.Name+".sh") o.l.Info("installing local:", pkg.String()) - o.l.Debug("filename:", filename) + o.l.Info("filename:", filename) if exists, err := o.localTapExists(filename); err != nil { return err @@ -265,10 +265,9 @@ func (o *Ownbrew) installLocal(ctx context.Context, pkg Package) error { "TEMP_DIR="+o.tempDir, ) cmd.Args = append(cmd.Args, pkg.Args...) - o.l.Debug("running:", cmd.String()) - if err := cmd.Run(); err != nil { - return errors.Wrapf(err, "failed to install: %s", pkg.String()) + if out, err := cmd.CombinedOutput(); err != nil { + return errors.Wrap(err, string(out)) } return nil @@ -324,9 +323,6 @@ func (o *Ownbrew) installRemote(ctx context.Context, pkg Package) error { cmd.Args = append(cmd.Args, pkg.Args...) cmd.Stdin = bytes.NewReader(script) cmd.Stdout = os.Stdout - if err != nil { - return err - } if o.l.IsLevel(log.LevelDebug) { cmd.Stderr = os.Stderr }