Add a joinPathOS method that converts paths to OS specific ones and u…

…se plan joinPath for files that are passed to cygwin programs.
adoptium · Nov 23, 2023 · ceecdfe · ceecdfe
1 parent a374308
commit ceecdfe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/sbin/build.sh b/sbin/build.sh
@@ -860,7 +860,7 @@ generateSBoM() {
     sbomTargetName="${sbomTargetName//\.tar\.gz/}"
   fi
 
-  local sbomJson="$(joinPath ${BUILD_CONFIG[WORKSPACE_DIR]} ${BUILD_CONFIG[TARGET_DIR]} ${sbomTargetName})"
+  local sbomJson="$(joinPathOS ${BUILD_CONFIG[WORKSPACE_DIR]} ${BUILD_CONFIG[TARGET_DIR]} ${sbomTargetName})"
   echo "OpenJDK SBOM will be ${sbomJson}."
 
   # Clean any old json
@@ -895,7 +895,7 @@ generateSBoM() {
   # Add FreeType 3rd party
   addFreeTypeVersionInfo
   # Add FreeMarker 3rd party (openj9)
-  local freemarker_version="$(joinPath ${BUILD_CONFIG[WORKSPACE_DIR]} ${BUILD_CONFIG[TARGET_DIR]} 'metadata/dependency_version_freemarker.txt')"
+  local freemarker_version="$(joinPathOS ${BUILD_CONFIG[WORKSPACE_DIR]} ${BUILD_CONFIG[TARGET_DIR]} 'metadata/dependency_version_freemarker.txt')"
   if [ -f "${freemarker_version}" ]; then
       addSBOMMetadataTools "${javaHome}" "${classpath}" "${sbomJson}" "FreeMarker" "$(cat ${freemarker_version})"
   fi

diff --git a/sbin/common/common.sh b/sbin/common/common.sh
@@ -97,14 +97,20 @@ function setDockerVolumeSuffix() {
 }
 
 # Joins multiple parts to a valid file path for the current OS
-function joinPath() {
+function joinPathOS() {
   local path=$(printf '/%s' "${@}" | sed 's|/\+|/|g')
   if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then
       path=$(cygpath -w "${path}")
   fi
   echo "${path}"
 }
 
+# Joins multiple parts to a valid file path using slashes
+function joinPath() {
+  local path=$(printf '/%s' "${@}" | sed 's|/\+|/|g')
+  echo "${path}"
+}
+
 # Create a Tar ball
 getArchiveExtension()
 {