modules/npm: Preserve the original package.json if it exists

Fixes #7690

1 files changed, 11 insertions, 10 deletions

diff --git a/common/hugio/copy.go b/common/hugio/copy.go
index 2b756cb44..be4506f4c 100644
--- a/common/hugio/copy.go
+++ b/common/hugio/copy.go
@@ -26,28 +26,29 @@ import (
 
 // CopyFile copies a file.
 func CopyFile(fs afero.Fs, from, to string) error {
-	sf, err := os.Open(from)
+	sf, err := fs.Open(from)
 	if err != nil {
 		return err
 	}
 	defer sf.Close()
-	df, err := os.Create(to)
+	df, err := fs.Create(to)
 	if err != nil {
 		return err
 	}
 	defer df.Close()
 	_, err = io.Copy(df, sf)
-	if err == nil {
-		si, err := os.Stat(from)
-		if err != nil {
-			err = os.Chmod(to, si.Mode())
+	if err != nil {
+		return err
+	}
+	si, err := fs.Stat(from)
+	if err != nil {
+		err = fs.Chmod(to, si.Mode())
 
-			if err != nil {
-				return err
-			}
+		if err != nil {
+			return err
 		}
-
 	}
+
 	return nil
 }