fix: fix the null pointer when 'kpm pull'.

kcl-lang · Jul 20, 2023 · 3d306c7 · 3d306c7
1 parent f5082de
commit 3d306c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/cmd/cmd_pull.go b/pkg/cmd/cmd_pull.go
@@ -66,7 +66,7 @@ func KpmPull(c *cli.Context) error {
 
 	ociOpt, event := opt.ParseOciOptionFromOciUrl(ociUrlOrPkgName, tag)
 
-	if event.Type() == reporter.IsNotUrl || event.Type() == reporter.UrlSchemeNotOci {
+	if event != nil && (event.Type() == reporter.IsNotUrl || event.Type() == reporter.UrlSchemeNotOci) {
 		settings := settings.GetSettings()
 		if settings.ErrorEvent != nil {
 			return settings.ErrorEvent

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -364,5 +364,7 @@ func RmNewline(s string) string {
 
 // JoinPath will join the 'elem' to the 'base' with '/'.
 func JoinPath(base, elem string) string {
-	return fmt.Sprintf("%s/%s", base, elem)
+	base = strings.TrimSuffix(base, "/")
+	elem = strings.TrimPrefix(elem, "/")
+	return base + "/" + elem
 }