From 4f91478f43de52af579fb51777c0882258329cdf Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 14 Jan 2025 17:54:54 +0000
Subject: [PATCH] Switch installer custom action from jscript to vbscript

* MS has deleted vbscript because breaking things is fun, so we use jscript
  instead to do the weird replace of '#' so that numbers read from the registry
  can be compared to numbers
---
 util/installer/Installer32.wxs |  6 +++---
 util/installer/Installer64.wxs | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/util/installer/Installer32.wxs b/util/installer/Installer32.wxs
index c37d1fbdd..eba64ad8f 100644
--- a/util/installer/Installer32.wxs
+++ b/util/installer/Installer32.wxs
@@ -341,10 +341,10 @@
     </Property>
 
     <!-- the versions are stored in DWORDs which windows installer returns as #14 etc. We need to strip the # to actually compare :( -->
-    <CustomAction Id="RemoveHash" Script="vbscript">
+    <CustomAction Id="RemoveHash" Script="jscript">
       <![CDATA[
-        Session.Property("VCRT32MAJOR") = Replace(Session.Property("VCRT32MAJOR"),"#","")
-        Session.Property("VCRT32MINOR") = Replace(Session.Property("VCRT32MINOR"),"#","")
+        Session.Property("VCRT32MAJOR") = Session.Property("VCRT32MAJOR").replace("#","")
+        Session.Property("VCRT32MINOR") = Session.Property("VCRT32MINOR").replace("#","")
         ]]>
     </CustomAction>
 
diff --git a/util/installer/Installer64.wxs b/util/installer/Installer64.wxs
index 2566e59f4..f57d168d0 100644
--- a/util/installer/Installer64.wxs
+++ b/util/installer/Installer64.wxs
@@ -397,12 +397,12 @@
     </Property>
 
     <!-- the versions are stored in DWORDs which windows installer returns as #14 etc. We need to strip the # to actually compare :( -->
-    <CustomAction Id="RemoveHash" Script="vbscript">
+    <CustomAction Id="RemoveHash" Script="jscript">
       <![CDATA[
-        Session.Property("VCRT64MAJOR") = Replace(Session.Property("VCRT64MAJOR"),"#","")
-        Session.Property("VCRT64MINOR") = Replace(Session.Property("VCRT64MINOR"),"#","")
-        Session.Property("VCRT32MAJOR") = Replace(Session.Property("VCRT32MAJOR"),"#","")
-        Session.Property("VCRT32MINOR") = Replace(Session.Property("VCRT32MINOR"),"#","")
+        Session.Property("VCRT64MAJOR") = Session.Property("VCRT64MAJOR").replace("#","")
+        Session.Property("VCRT64MINOR") = Session.Property("VCRT64MINOR").replace("#","")
+        Session.Property("VCRT32MAJOR") = Session.Property("VCRT32MAJOR").replace("#","")
+        Session.Property("VCRT32MINOR") = Session.Property("VCRT32MINOR").replace("#","")
         ]]>
     </CustomAction>