fix: fix windows path bug (#280)

Signed-off-by: zongz <[email protected]>
kcl-lang · Mar 18, 2024 · 80caaec · 80caaec
1 parent f70f6ff
commit 80caaec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/pkg/api/kpm_run.go b/pkg/api/kpm_run.go
@@ -194,7 +194,7 @@ func RunOciPkg(ociRef, version string, opts *opt.CompileOptions) (*kcl.KCLResult
 	// clean the temp dir.
 	defer os.RemoveAll(tmpDir)
 
-	localPath := ociOpts.AddStoragePathSuffix(tmpDir)
+	localPath := ociOpts.SanitizePathWithSuffix(tmpDir)
 
 	// 2. Pull the tar.
 	err = oci.Pull(localPath, ociOpts.Reg, ociOpts.Repo, ociOpts.Tag, kpmcli.GetSettings())

diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -487,7 +487,7 @@ func (c *KpmClient) CompileOciPkg(ociSource, version string, opts *opt.CompileOp
 	// clean the temp dir.
 	defer os.RemoveAll(tmpDir)
 
-	localPath := ociOpts.AddStoragePathSuffix(tmpDir)
+	localPath := ociOpts.SanitizePathWithSuffix(tmpDir)
 
 	// 2. Pull the tar.
 	err = c.pullTarFromOci(localPath, ociOpts)
@@ -1015,7 +1015,7 @@ func (c *KpmClient) PullFromOci(localPath, source, tag string) error {
 	// clean the temp dir.
 	defer os.RemoveAll(tmpDir)
 
-	storepath := ociOpts.AddStoragePathSuffix(tmpDir)
+	storepath := ociOpts.SanitizePathWithSuffix(tmpDir)
 	err = c.pullTarFromOci(storepath, ociOpts)
 	if err != nil {
 		return err

diff --git a/pkg/opt/opt.go b/pkg/opt/opt.go
@@ -275,6 +275,7 @@ func ParseOciUrl(ociUrl string) (*OciOptions, *reporter.KpmEvent) {
 //	}
 //
 // You will get a path '/usr/test/docker.io/test/testRepo/v0.0.1'.
+// Deprecated: This function will be deprecated, use 'SanitizePathWithSuffix' instead.
 func (oci *OciOptions) AddStoragePathSuffix(pathPrefix string) string {
 	return filepath.Join(filepath.Join(filepath.Join(pathPrefix, oci.Reg), oci.Repo), oci.Tag)
 }