Determine the sbom target file name more robust.

adoptium · Nov 23, 2023 · 6a5a1c9 · 6a5a1c9
1 parent bda0f3c
commit 6a5a1c9
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/sbin/build.sh b/sbin/build.sh
@@ -848,11 +848,16 @@ generateSBoM() {
   local classpath="$(getCyclonedxClasspath)"
 
   local sbomTargetName=$(echo "${BUILD_CONFIG[TARGET_FILE_NAME]//-jdk/-sbom}.json")
+  # if the replacement did not work as the target file name does not contain the pattern '-jdk',
+  # construct the sbom name by just appending '-sbom.json' to the target file name.
+  if [[ ${sbomTargetName} != *"-sbom"* ]]; then
+    sbomTargetName=$(echo "${BUILD_CONFIG[TARGET_FILE_NAME]}-sbom.json")
+  fi
   # Remove the tarball extension from the name to be used for the SBOM
   if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then
-      sbomTargetName="${sbomTargetName//\.zip/}"
+    sbomTargetName="${sbomTargetName//\.zip/}"
   else
-      sbomTargetName="${sbomTargetName//\.tar\.gz/}"
+    sbomTargetName="${sbomTargetName//\.tar\.gz/}"
   fi
 
   local sbomJson="$(joinPath ${BUILD_CONFIG[WORKSPACE_DIR]} ${BUILD_CONFIG[TARGET_DIR]} ${sbomTargetName})"