Merge branch 'thunderbird_68.12.0' into 'master'

Thunderbird -> v68.12.0

See merge request !136

packages/thunderbird.xml

@@ -6,7 +6,7 @@
     <!-- NB: we've had problems with major version bumps which sometimes change the format of options we add in %WPKGINSTITUTION%-prefs.js.
     Thus, we tie that to a version, and please test carefully when upgrading -->
 
-    <variable name="version" value="68.10.0" />  <!-- For Maths, set version value in package id thunderbird_config_maths to the same as this VERSION -->
+    <variable name="version" value="68.12.0" />  <!-- For Maths, set version value in package id thunderbird_config_maths to the same as this VERSION -->
     <variable name="prefsversion" value="68" />
     <check type="uninstall" condition="versiongreaterorequal" path="Mozilla Thunderbird.*" value="%version%" />
     <chain package-id="thunderbird_config_maths">
@@ -15,6 +15,21 @@
       </condition>
     </chain>
 
+    <!-- Should Thunderbird 64 bit already be installed remove it -->
+    <install cmd='%WPKGSOFTWARE%\wpkg\tools\waitforprocess.cmd Un_A.exe' />
+    <install cmd='"%programfiles%\Mozilla Thunderbird\uninstall\helper.exe" /S' >
+      <condition>
+         <check type="file" condition="exists" path="%programfiles%\Mozilla Thunderbird\uninstall\helper.exe" />
+      </condition>
+    </install>
+    <install cmd='%WPKGSOFTWARE%\wpkg\tools\waitforprocess.cmd Un_A.exe' />
+    <!-- remove any config -->
+    <install cmd='cmd /c rmdir /s /q "%programfiles%\Mozilla Thunderbird\"' >
+      <condition>
+         <check type="file" condition="exists" path="%programfiles%\Mozilla Thunderbird\thunderbird.cfg" />
+      </condition>
+    </install>
+
     <!-- Installing 32 bit version while Add-on's all move to 64 bit -->
     <install cmd='"%WPKGSOFTWARE%\thunderbird\Thunderbird Setup %version%.exe" -ms' />
 
@@ -51,9 +66,9 @@
       <exit code="0" />
       <exit code="128" />
     </remove>
-    <remove cmd='cmd /c %WPKGSOFTWARE%\wpkg\tools\waitforprocess.cmd Au_.exe' />
+    <remove cmd='%WPKGSOFTWARE%\wpkg\tools\waitforprocess.cmd Au_.exe' />
     <remove cmd='"%programfiles(x86)%\Mozilla Thunderbird\uninstall\helper.exe" /S' />
-    <remove cmd='cmd /c %WPKGSOFTWARE%\wpkg\tools\waitforprocess.cmd Au_.exe' />
+    <remove cmd='%WPKGSOFTWARE%\wpkg\tools\waitforprocess.cmd Au_.exe' />
     <remove cmd='reg delete HKLM\SOFTWARE\Policies\Mozilla\Thunderbird /v DisableAppUpdate /f'/>
   </package>