From 3b5929268d53ed1671acd26a31daba6cc37f0b17 Mon Sep 17 00:00:00 2001
From: adipiciu <13155063+adipiciu@users.noreply.github.com>
Date: Fri, 23 Aug 2024 15:11:47 +0200
Subject: [PATCH 1/3] Changed INSTALLDIR to fixed path to fix #422 and #600

Signed-off-by: adipiciu <13155063+adipiciu@users.noreply.github.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 354683a4a..16d9c33c1 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.ProductVersion)-$(var.JVM)" ?>
+    <?define AppFolder="jre-$(var.ProductMajorVersion)-$(var.JVM)" ?>
   <?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.ProductVersion)-$(var.JVM)" ?>
+    <?define AppFolder="jdk-$(var.ProductMajorVersion)-$(var.JVM)" ?>
   <?endif?>
 
   <!-- Registry key change with new numbering format since Java 9 -->

From cffc155c5631e4e7378a2cecabb0720695df74b5 Mon Sep 17 00:00:00 2001
From: Nikolas Grottendieck <git@nikolasgrottendieck.com>
Date: Fri, 23 Aug 2024 15:12:41 +0200
Subject: [PATCH 2/3] fix: apply formatting rules and remove unnecessary
 trailing whitespace

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

diff --git a/wix/Includes/OpenJDK.Variables.wxi.template b/wix/Includes/OpenJDK.Variables.wxi.template
index 16d9c33c1..f1ec126f8 100644
--- a/wix/Includes/OpenJDK.Variables.wxi.template
+++ b/wix/Includes/OpenJDK.Variables.wxi.template
@@ -46,16 +46,16 @@
       <?define OracleJavasoftBaseKey="JRE" ?>
     <?else?>
       <?define OracleJavasoftBaseKey="JDK" ?>
-    <?endif?>            
+    <?endif?>
   <?else?>
     <?define OracleVersionKey="1.8" ?>
     <?if $(env.PRODUCT_CATEGORY)="jre"?>
       <?define OracleJavasoftBaseKey="Java Runtime Environment" ?>
     <?else?>
       <?define OracleJavasoftBaseKey="Java Development Kit" ?>
-    <?endif?>    
+    <?endif?>
   <?endif?>
-  
+
   <?if $(var.JVM)="openj9" ?>
     <?define license="license-OpenJ9.en-us.rtf" ?>
     <?define license_shown="1" ?>
@@ -92,7 +92,7 @@
   <?else?>
     <?define DllPath="no DllPath known for $(var.JVM)" ?>
   <?endif?>
-  
+
   <!-- Static settings, DO NOT TOUCH or upgrades will break! -->
   <?define RTMProductVersion="1.0.0" ?>
 </Include>

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 3/3] 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 -->