Allows us to use the jdk10 boot directory in the wrong directory

Currently, the JDK10 boot directory in the Orka node template
is called jdk-10 instead of the correct jdk10.

This change allows us to tolerate this setup until we are able
to regenerate the Orka node template.

Signed-off-by: Adam Farley <[email protected]>

build-farm/platform-specific-configurations/mac.sh

@@ -114,6 +114,11 @@ if [ ! -d "$(eval echo "\$$BOOT_JDK_VARIABLE")" ]; then
     if [ -x "/Library/Java/JavaVirtualMachines/jdk${JDK_BOOT_VERSION}/Contents/Home/bin/javac" ]; then
       echo "Could not use ${BOOT_JDK_VARIABLE} - using /Library/Java/JavaVirtualMachines/jdk${JDK_BOOT_VERSION}/Contents/Home"
       export "${BOOT_JDK_VARIABLE}"="/Library/Java/JavaVirtualMachines/jdk${JDK_BOOT_VERSION}/Contents/Home"
+    elif [ -x "/Library/Java/JavaVirtualMachines/jdk-${JDK_BOOT_VERSION}/Contents/Home/bin/javac" ]; then
+      # TODO: This temporary ELIF allows us to accomodate undesired dashes that may be present
+      # in boot directory names (e.g. jdk-10) on Orka node images (fix pending).
+      echo "Could not use ${BOOT_JDK_VARIABLE} - using /Library/Java/JavaVirtualMachines/jdk-${JDK_BOOT_VERSION}/Contents/Home"
+      export "${BOOT_JDK_VARIABLE}"="/Library/Java/JavaVirtualMachines/jdk-${JDK_BOOT_VERSION}/Contents/Home"
     elif [ "$JDK_BOOT_VERSION" -ge 8 ]; then # Adoptium has no build pre-8
       mkdir -p "$bootDir"
       for releaseType in "ga" "ea"