Texstudio => 4.2.2

packages/texstudio.xml

@@ -2,9 +2,9 @@
 <packages:packages xmlns:packages="http://www.wpkg.org/packages">
 
   <package id="texstudio" name="TeXstudio" revision="%version%.1" reboot="false" priority="10">
-    <variable name="version" value="2.12.22" />
-    <variable name="uninstallversion" value="2.12.18" /> <!-- for v2.12.22 the Uninstaller DisplayVersion is v2.12.18, not the same as the installer, an error I guess -->
-    <check type="uninstall" condition="versiongreaterorequal" path="TeXstudio.*" value="%uninstallversion%"/>
+    <variable name="version" value="4.2.2" />
+
+    <check type="uninstall" condition="versiongreaterorequal" path="TeXstudio.*" value="%version%"/>
 
     <install cmd='"%WPKGSOFTWARE%\texstudio\texstudio-%VERSION%-win-qt5.exe" /S' />
 
@@ -17,14 +17,22 @@
         <check type="file" condition="exists" path="%PROGRAMFILES(x86)%\TeXstudio\unins000.exe" />
       </condition>
     </remove>
+    <!-- remove any old 32 bit versions -->
+    <remove cmd='%WPKGSOFTWARE%\wpkg\tools\waitforprocess.cmd Un_A.exe' />
+    <remove cmd='"%PROGRAMFILES(x86)%\TeXstudio\uninstall.exe" /S'>
+      <condition>
+        <check type="file" condition="exists" path="%PROGRAMFILES(x86)%\TeXstudio\uninstall.exe" />
+      </condition>
+    </remove>
+    <remove cmd='%WPKGSOFTWARE%\wpkg\tools\waitforprocess.cmd Un_A.exe' />
 
     <!-- uninstaller for the "current" version. We acknowledge the possibility of two brief
          unnecessary waitforprocess.cmds for the sake of not littering the entire xml
          with repeated <condition>s -->
     <remove cmd='%WPKGSOFTWARE%\wpkg\tools\waitforprocess.cmd Un_A.exe' />
-    <remove cmd='"%PROGRAMFILES(x86)%\TeXstudio\uninstall.exe" /S'>
+    <remove cmd='"%PROGRAMFILES%\TeXstudio\uninstall.exe" /S'>
       <condition>
-        <check type="file" condition="exists" path="%PROGRAMFILES(x86)%\TeXstudio\uninstall.exe" />
+        <check type="file" condition="exists" path="%PROGRAMFILES%\TeXstudio\uninstall.exe" />
       </condition>
     </remove>
     <remove cmd='%WPKGSOFTWARE%\wpkg\tools\waitforprocess.cmd Un_A.exe' />