From c5d51ed664d286c63a1a07ae9c56dc7399633640 Mon Sep 17 00:00:00 2001
From: Nikolas Grottendieck <git@nikolasgrottendieck.com>
Date: Fri, 23 Aug 2024 15:28:56 +0200
Subject: [PATCH] adjust folder naming to be consistent across platforms to
 `temurin-<ver>-<jre|jdk>`

See https://github.com/adoptium/installer/pull/789#issuecomment-2306065205 for
details.

Fixes #422

Signed-off-by: Nikolas Grottendieck <git@nikolasgrottendieck.com>
---
 wix/Includes/OpenJDK.Variables.wxi.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wix/Includes/OpenJDK.Variables.wxi.template b/wix/Includes/OpenJDK.Variables.wxi.template
index f1ec126f8..a8df8e511 100644
--- a/wix/Includes/OpenJDK.Variables.wxi.template
+++ b/wix/Includes/OpenJDK.Variables.wxi.template
@@ -27,7 +27,7 @@
     <?define FeatureMainDescription="!(loc.JREFeatureMainDescription)" ?>
 
     <?define ProductCategory="JRE" ?>
-    <?define AppFolder="jre-$(var.ProductMajorVersion)-$(var.JVM)" ?>
+    <?define AppFolder="temurin-$(var.ProductMajorVersion)-jre" ?>
   <?else?>
     <?define ProductName="!(loc.JDKProductName)" ?>
     <?define ProductNameWithVersion="!(loc.JDKProductName) $(var.ProductVersionString) $(var.Arch)" ?>
@@ -36,7 +36,7 @@
     <?define FeatureMainDescription="!(loc.JDKFeatureMainDescription)" ?>
 
     <?define ProductCategory="JDK" ?>
-    <?define AppFolder="jdk-$(var.ProductMajorVersion)-$(var.JVM)" ?>
+    <?define AppFolder="temurin-$(var.ProductMajorVersion)-jdk" ?>
   <?endif?>
 
   <!-- Registry key change with new numbering format since Java 9 -->