Skip to content

Commit

Permalink
Update Main.wxs.template
Browse files Browse the repository at this point in the history
Removed the JavaSoftCurrentVersion component condition.

Temurin 8 JavaSoftCurrentVersion key is not removed at uninstall, because the condition is never satisfied. For Temurin 11, 17, etc, the condition doesn't make any sense because it's comparing with version "1.8", but Temurin 8 has totally different keys.

Signed-off-by: adipiciu <[email protected]>
  • Loading branch information
adipiciu authored Mar 16, 2024
1 parent 501ae8f commit a9e428c
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion wix/Main.wxs.template
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@
<RegistryValue Root="HKMU" Key="SOFTWARE\Classes\{vendor}.jarfile\shell\open\command" Type="string" Value="&quot;[INSTALLDIR]bin\javaw.exe&quot; -jar &quot;%1&quot; %*" KeyPath="no" />
</Component>
<Component Id="SetOracleJavaSoftKeysCurrentVersion" Guid="*">
<Condition><![CDATA[NOT JAVASOFT_CURRENTVERSION OR JAVASOFT_CURRENTVERSION <> "1.8" AND JAVASOFT_CURRENTVERSION < $(var.ProductMajorVersion)]]></Condition>
<RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\$(var.OracleJavasoftBaseKey)" Name="CurrentVersion" Type="string" Value="$(var.OracleVersionKey)" KeyPath="yes" />
</Component>
<Component Id="SetOracleJavaSoftKeys" Guid="*">
Expand Down

0 comments on commit a9e428c

Please sign in to comment.