Fix Windows create-sbom failure when TARGET_DIR has no trailing / (#4107

) Signed-off-by: Andrew Leonard <anleonar@redhat.com>
adoptium · Jan 3, 2025 · 9a4d087 · 9a4d087
1 parent f09b521
commit 9a4d087
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sbin/build.sh b/sbin/build.sh
@@ -1387,8 +1387,8 @@ addCompilerWindows() {
   local inputSdkFile="${BUILD_CONFIG[TARGET_FILE_NAME]}"
 
   # Derive Windows SDK Version From Built JDK
-  mkdir "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[TARGET_DIR]}temp"
-  unzip -j -o -q "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[TARGET_DIR]}$inputSdkFile" -d "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[TARGET_DIR]}/temp"
+  mkdir "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[TARGET_DIR]}/temp"
+  unzip -j -o -q "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[TARGET_DIR]}/$inputSdkFile" -d "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[TARGET_DIR]}/temp"
   local ucrt_file=$(cygpath -m ${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[TARGET_DIR]}/temp/ucrtbase.dll)
   local ucrt_version=$(powershell.exe "(Get-Command $ucrt_file).FileVersionInfo.FileVersion")
   rm -rf "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[TARGET_DIR]}/temp"