Merge pull request #8 from fnxpt/Spec1.5

fix issue with merge multiple files/dirs
fnxpt · Mar 8, 2024 · 38a1de7 · 38a1de7
2 parents 3ae0a0b + 162de0b
commit 38a1de7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/main.go b/main.go
@@ -22,7 +22,7 @@ const (
 	MergeModeSmart
 )
 
-var version = "0.0.6"
+var version = "0.0.7"
 
 var rootComponent = &cyclonedx.Component{
 	BOMRef: "root",
@@ -36,6 +36,7 @@ var outputFormat = cyclonedx.BOMFileFormatJSON
 var output = os.Stdout
 
 func main() {
+	sbom = utils.NewBOM(rootComponent)
 	parseArguments()
 }
 
@@ -79,12 +80,10 @@ func parseArguments() {
 	})
 
 	flag.Func("file", "merges file", func(value string) error {
-		sbom = utils.NewBOM(rootComponent)
 		return fileMerge(value)
 	})
 
 	flag.Func("dir", "merges files in directory", func(value string) error {
-		sbom = utils.NewBOM(rootComponent)
 		return dirMerge(value)
 	})
 

diff --git a/utils/utils.go b/utils/utils.go
@@ -21,7 +21,7 @@ func NewBOM(rootComponent *cyclonedx.Component) *cyclonedx.BOM {
 				{
 					Type:    "application",
 					Name:    "cyclonedx-merge",
-					Version: "0.0.6",
+					Version: "0.0.7",
 				},
 			},
 		},