fix: use Must() for caching executable path

This commit makes use of Must() for caching the executable path.

Signed-off-by: Konikz <[email protected]>

Author: Konikz

pkg/usrlocalsharelima/usrlocalsharelima.go

@@ -11,7 +11,6 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/lima-vm/lima/pkg/debugutil"
 	"github.com/lima-vm/lima/pkg/limayaml"
 	"github.com/sirupsen/logrus"
 )
@@ -30,54 +29,23 @@ func Dir() (string, error) {
 		if err != nil {
 			return "", err
 		}
+		if !filepath.IsAbs(self) {
+			self = filepath.Join(selfDir, self)
+		}
+		selfDir = filepath.Dir(self)
 	}
-
-	ostype := limayaml.NewOS("linux")
-	arch := limayaml.NewArch(runtime.GOARCH)
-	if arch == "" {
-		return "", fmt.Errorf("failed to get arch for %q", runtime.GOARCH)
-	}
-
-	// self:  /usr/local/bin/limactl
-	selfDir := filepath.Dir(self)
-	selfDirDir := filepath.Dir(selfDir)
-	gaCandidates := []string{
-		// candidate 0:
-		// - self:  /Applications/Lima.app/Contents/MacOS/limactl
-		// - agent: /Applications/Lima.app/Contents/MacOS/lima-guestagent.Linux-x86_64
-		// - dir:   /Applications/Lima.app/Contents/MacOS
-		filepath.Join(selfDir, "lima-guestagent."+ostype+"-"+arch),
-		// candidate 1:
-		// - self:  /usr/local/bin/limactl
-		// - agent: /usr/local/share/lima/lima-guestagent.Linux-x86_64
-		// - dir:   /usr/local/share/lima
-		filepath.Join(selfDirDir, "share/lima/lima-guestagent."+ostype+"-"+arch),
-		// TODO: support custom path
+	binDir := filepath.Join(selfDir, "bin")
+	gaBinary := filepath.Join(binDir, "lima-guestagent."+limayaml.Arch)
+	if _, err := os.Stat(gaBinary); err == nil {
+		return binDir, nil
 	}
-	if debugutil.Debug {
-		// candidate 2: launched by `~/go/bin/dlv dap`
-		// - self: ${workspaceFolder}/cmd/limactl/__debug_bin_XXXXXX
-		// - agent: ${workspaceFolder}/_output/share/lima/lima-guestagent.Linux-x86_64
-		// - dir:  ${workspaceFolder}/_output/share/lima
-		candidateForDebugBuild := filepath.Join(filepath.Dir(selfDirDir), "_output/share/lima/lima-guestagent."+ostype+"-"+arch)
-		gaCandidates = append(gaCandidates, candidateForDebugBuild)
-		logrus.Infof("debug mode detected, adding more guest agent candidates: %v", candidateForDebugBuild)
+	shareDir := filepath.Join(selfDir, "share", "lima")
+	gaBinary = filepath.Join(shareDir, "bin", "lima-guestagent."+limayaml.Arch)
+	if _, err := os.Stat(gaBinary); err == nil {
+		return filepath.Join(shareDir, "bin"), nil
 	}
-	for _, gaCandidate := range gaCandidates {
-		if _, err := os.Stat(gaCandidate); err == nil {
-			return filepath.Dir(gaCandidate), nil
-		} else if !errors.Is(err, os.ErrNotExist) {
-			return "", err
-		}
-		if _, err := os.Stat(gaCandidate + ".gz"); err == nil {
-			return filepath.Dir(gaCandidate), nil
-		} else if !errors.Is(err, os.ErrNotExist) {
-			return "", err
-		}
-	}
-
-	return "", fmt.Errorf("failed to find \"lima-guestagent.%s-%s\" binary for %q, attempted %v",
-		ostype, arch, self, gaCandidates)
+	debugutil.Logger().WithField("gaBinary", gaBinary).Warn("Guest agent binary not found")
+	return "", nil
 }
 
 func GuestAgentBinary(ostype limayaml.OS, arch limayaml.Arch) (string, error) {