From 6b8b37788646b6d6b505bb9cc9cfd21ab9c928b0 Mon Sep 17 00:00:00 2001 From: Evsyukov Denis Date: Mon, 11 Dec 2023 15:23:12 +0300 Subject: [PATCH] Revert "fix: close file without defer" This reverts commit 8d1c45ff7acd0bf7e19555a1b340dff55bbed9e5. --- utils/utils.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/utils/utils.go b/utils/utils.go index 117093d..d5ab731 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -44,10 +44,12 @@ func DownloadWithProgress(url string, tarName string, destFolder string) (err er return fmt.Errorf("%s returned status code %d", url, resp.StatusCode) } - f, err := os.OpenFile(destTarPath, os.O_CREATE|os.O_WRONLY, 0o644) - if err != nil { - return err - } + f, _ := os.OpenFile(destTarPath, os.O_CREATE|os.O_WRONLY, 0o644) + defer func(f *os.File) { + if err = f.Close(); err != nil { + color.Errorln("==> [Error]: failed close file", err.Error()) + } + }(f) bar := progressbar.DefaultBytes( resp.ContentLength, @@ -55,16 +57,9 @@ func DownloadWithProgress(url string, tarName string, destFolder string) (err er ) _, err = io.Copy(io.MultiWriter(f, bar), resp.Body) if err != nil { - if err := f.Close(); err != nil { - color.Errorln("==> [Error]: failed close file", err.Error()) - } return err } - if err = f.Close(); err != nil { - color.Errorln("==> [Error]: failed close file", err.Error()) - } - return nil }