fix: fix the relative path

aquaproj · Sep 28, 2024 · 39523e2 · 39523e2
1 parent 9b7f2f1
commit 39523e2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pkg/config/registry/config.go b/pkg/config/registry/config.go
@@ -15,6 +15,7 @@ type File struct {
 	Name string `validate:"required" json:"name,omitempty" yaml:",omitempty"`
 	Src  string `json:"src,omitempty" yaml:",omitempty"`
 	Dir  string `json:"dir,omitempty" yaml:",omitempty"`
+	// Link is the relative path from Src to the link
 	Link string `json:"link,omitempty" yaml:",omitempty"`
 }
 

diff --git a/pkg/installpackage/check_file.go b/pkg/installpackage/check_file.go
@@ -133,7 +133,14 @@ func (is *Installer) checkFileSrc(ctx context.Context, logE *logrus.Entry, pkg *
 		return exePath, nil
 	}
 
-	if err := is.createLink(logE, filepath.Join(filepath.Dir(fileSrc), file.Link), file.Link); err != nil {
+	// file.Link is the relative path from exePath to the link
+	link := filepath.Join(filepath.Dir(exePath), file.Link)
+	dest, err := filepath.Rel(filepath.Dir(link), exePath)
+	if err != nil {
+		return "", err
+	}
+
+	if err := is.createLink(logE, link, dest); err != nil {
 		return "", fmt.Errorf("create the symbolic link: %w", err)
 	}