Move open and gzip back to cidata again

Signed-off-by: Anders F Björklund <[email protected]>

Author: afbjorklund

pkg/cidata/cidata.go

@@ -1,6 +1,7 @@
 package cidata
 
 import (
+	"compress/gzip"
 	"errors"
 	"fmt"
 	"io"
@@ -345,9 +346,21 @@ func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort
 	if err != nil {
 		return err
 	}
-	guestAgent, err := usrlocalsharelima.Open(guestAgentBinary)
+	var guestAgent io.ReadCloser
+	guestAgent, err = os.Open(guestAgentBinary)
 	if err != nil {
-		return err
+		if !errors.Is(err, os.ErrNotExist) {
+			return err
+		}
+		compressedGuestAgent, err := os.Open(guestAgentBinary + ".gz")
+		if err != nil {
+			return err
+		}
+		logrus.Debugf("Decompressing %s.gz", guestAgentBinary)
+		guestAgent, err = gzip.NewReader(compressedGuestAgent)
+		if err != nil {
+			return err
+		}
 	}
 	defer guestAgent.Close()
 	layout = append(layout, iso9660util.Entry{

pkg/usrlocalsharelima/usrlocalsharelima.go

@@ -1,17 +1,14 @@
 package usrlocalsharelima
 
 import (
-	"compress/gzip"
 	"errors"
 	"fmt"
-	"io"
 	"io/fs"
 	"os"
 	"path/filepath"
 	"runtime"
 
 	"github.com/lima-vm/lima/pkg/limayaml"
-	"github.com/sirupsen/logrus"
 )
 
 func Dir() (string, error) {
@@ -82,19 +79,3 @@ func GuestAgentBinary(ostype limayaml.OS, arch limayaml.Arch) (string, error) {
 	}
 	return filepath.Join(dir, "lima-guestagent."+ostype+"-"+arch), nil
 }
-
-func Open(path string) (io.ReadCloser, error) {
-	reader, err := os.Open(path)
-	if errors.Is(err, os.ErrNotExist) {
-		reader, err := os.Open(path + ".gz")
-		if err != nil {
-			return nil, err
-		}
-		logrus.Debugf("Decompressing %s.gz", path)
-		return gzip.NewReader(reader)
-	}
-	if err != nil {
-		return nil, err
-	}
-	return reader, nil
-}