Fixes

Signed-off-by: Stewart X Addison <[email protected]>
adoptium · Dec 4, 2023 · 1667f0c · 1667f0c
1 parent e052a07
commit 1667f0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sbin/build.sh b/sbin/build.sh
@@ -869,7 +869,7 @@ generateSBoM() {
 
   # Set default SBOM formulation
   addSBOMFormulation "${javaHome}" "${classpath}" "${sbomJson}"
-  addSBOMFormulationComponent "${javaHome}" "${classpath}" "${sbomJson}"
+  addSBOMFormulationComp "${javaHome}" "${classpath}" "${sbomJson}" "CycloneDX SHAs"
 
   # Add Tool Summary section from configure.txt
   checkingToolSummary

diff --git a/sbin/common/sbom.sh b/sbin/common/sbom.sh
@@ -53,12 +53,12 @@ addSBOMFormulation() {
   "${javaHome}"/bin/java -cp "${classpath}" temurin.sbom.TemurinGenSBOM --addFormulation --jsonFile "${jsonFile}"
 }
 
-addSBOMFormulationComponent() {
+addSBOMFormulationComp() {
   local javaHome="${1}"
   local classpath="${2}"
   local jsonFile="${3}"
   local name="${4}"
-  "${javaHome}"/bin/java -cp "${classpath}" temurin.sbom.TemurinGenSBOM --addFormulationCompoment --jsonFile "${jsonFile}" --name "${name}"
+  "${javaHome}"/bin/java -cp "${classpath}" temurin.sbom.TemurinGenSBOM --addFormulationComp --jsonFile "${jsonFile}" --name "${name}"
 }  
 
 # Ref: https://cyclonedx.org/docs/1.4/json/#formulation
@@ -70,7 +70,7 @@ addSBOMFormulationComponentProperty() {
   local compName="${4}"
   local name="${5}"
   local value="${6}"
-  "${javaHome}"/bin/java -cp "${classpath}" temurin.sbom.TemurinGenSBOM --addFormulationCompProp --jsonFile "${jsonFile}" --compName --name "${name}" --value "${value}"
+  "${javaHome}"/bin/java -cp "${classpath}" temurin.sbom.TemurinGenSBOM --addFormulationCompProp --jsonFile "${jsonFile}" --compName ${compName} --name "${name}" --value "${value}"
 }