From 94602ddd72eb4aa443247bbf5e534cf85288df38 Mon Sep 17 00:00:00 2001
From: Volodymyr Zotov <volodymyr.zotov@agilebits.com>
Date: Fri, 5 Sep 2025 11:34:18 -0500
Subject: [PATCH] Fix lint errors

---
 pkg/testhelper/system/system.go | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkg/testhelper/system/system.go b/pkg/testhelper/system/system.go
index afc0a59..defe461 100644
--- a/pkg/testhelper/system/system.go
+++ b/pkg/testhelper/system/system.go
@@ -1,6 +1,7 @@
 package system
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -64,14 +65,24 @@ func ReplaceFile(src, dst string) error {
 	if err != nil {
 		return err
 	}
-	defer sourceFile.Close()
+	defer func(sourceFile *os.File) {
+		cerr := sourceFile.Close()
+		if err != nil {
+			err = errors.Join(err, cerr)
+		}
+	}(sourceFile)
 
 	// Create (or overwrite) the destination file
 	destFile, err := os.Create(filepath.Join(rootDir, dst))
 	if err != nil {
 		return err
 	}
-	defer destFile.Close()
+	defer func(destFile *os.File) {
+		cerr := destFile.Close()
+		if err != nil {
+			err = errors.Join(err, cerr)
+		}
+	}(destFile)
 
 	// Copy contents
 	if _, err = io.Copy(destFile, sourceFile); err != nil {