minor

wttech · Aug 22, 2024 · 5cfb16f · 5cfb16f
1 parent b67d822
commit 5cfb16f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pkg/content/content.go b/pkg/content/content.go
@@ -20,7 +20,7 @@ import (
 const (
 	JCRRoot                   = "jcr_root"
 	JCRContentFile            = ".content.xml"
-	JCRContentFileSuffix      = ".xml"
+	XmlFileSuffix             = ".xml"
 	JCRMixinTypesProp         = "jcr:mixinTypes"
 	JCRRootPrefix             = "<jcr:root"
 	PropPattern               = "^\\s*([^ =]+)=\"([^\"]+)\"(.*)$"
@@ -156,7 +156,7 @@ func (c Manager) cleanDotContents(root string) error {
 }
 
 func (c Manager) cleanDotContentFile(path string) error {
-	if !strings.HasSuffix(path, JCRContentFileSuffix) {
+	if !strings.HasSuffix(path, XmlFileSuffix) {
 		return nil
 	}
 

diff --git a/pkg/content_manager.go b/pkg/content_manager.go
@@ -186,7 +186,7 @@ func (cm *ContentManager) Push(contentPath string, clean bool, packageOpts Packa
 
 func determineCleanFile(file string) string {
 	if namespacePatternRegex.MatchString(file) && !strings.HasSuffix(file, content.JCRContentFile) {
-		return filepath.Join(strings.ReplaceAll(file, content.JCRContentFileSuffix, ""), content.JCRContentFile)
+		return filepath.Join(strings.ReplaceAll(file, content.XmlFileSuffix, ""), content.JCRContentFile)
 	}
 	return file
 }

diff --git a/pkg/package_manager.go b/pkg/package_manager.go
@@ -264,8 +264,8 @@ func DetermineFilterRoot(contentPath string) string {
 		filterRoot = strings.ReplaceAll(filterRoot, content.JCRContentFile, content.JCRContentNode)
 	} else if strings.HasSuffix(filterRoot, content.JCRContentFile) {
 		filterRoot = filepath.Dir(filterRoot)
-	} else if strings.HasSuffix(filterRoot, content.JCRContentFileSuffix) {
-		filterRoot = strings.ReplaceAll(filterRoot, content.JCRContentFileSuffix, "")
+	} else if strings.HasSuffix(filterRoot, content.XmlFileSuffix) {
+		filterRoot = strings.ReplaceAll(filterRoot, content.XmlFileSuffix, "")
 	}
 	filterRoot = namespacePatternRegex.ReplaceAllString(filterRoot, "/$2:")
 	filterRoot = strings.ReplaceAll(filterRoot, "/__", "/_")