fix: close file without defer

kevincobain2000 · Dec 11, 2023 · 8d1c45f · 8d1c45f
1 parent 7fe268f
commit 8d1c45f
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/utils/utils.go b/utils/utils.go
@@ -44,22 +44,27 @@ func DownloadWithProgress(url string, tarName string, destFolder string) (err er
 		return fmt.Errorf("%s returned status code %d", url, resp.StatusCode)
 	}
 
-	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)
+	f, err := os.OpenFile(destTarPath, os.O_CREATE|os.O_WRONLY, 0o644)
+	if err != nil {
+		return err
+	}
 
 	bar := progressbar.DefaultBytes(
 		resp.ContentLength,
 		"Downloading",
 	)
 	_, 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
 }