From 1cde065ce71aa7415292576ea41cffd100bca971 Mon Sep 17 00:00:00 2001
From: Adam Thorn <alt36@cam.ac.uk>
Date: Fri, 8 Jan 2016 14:23:57 +0000
Subject: [PATCH] Mozilla Thunderbird -> v38.5.1
---
thunderbird.xml | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/thunderbird.xml b/thunderbird.xml
index 1d3c5a45..0a700f5c 100755
--- a/thunderbird.xml
+++ b/thunderbird.xml
@@ -7,7 +7,7 @@
we add in chemistry-prefs.js. Thus, we tie that to a version, and please test carefully when
upgrading -->
- <variable name="version" value="38.5.0" />
+ <variable name="version" value="38.5.1" />
<variable name="prefsversion" value="38" />
<check type="uninstall" condition="exists" path="Mozilla Thunderbird %version%.*" />
@@ -15,8 +15,10 @@
<install cmd='cmd /c copy "%software%\thunderbird\chemistry-prefs.js-%prefsversion%" "%programfileswpkg%\mozilla thunderbird\defaults\pref\chemistry-prefs.js" '/>
<install cmd='cmd /c copy "%software%\thunderbird\cam.ac.uk.xml" "%programfileswpkg%\mozilla thunderbird\isp\cam.ac.uk.xml" '/>
<install cmd='%software%\wpkg\tools\copydir.cmd "%software%\thunderbird\dictionaries" "%programfileswpkg%\mozilla thunderbird\dictionaries"' />
-
- <upgrade cmd='taskkill /F /IM thunderbird.exe'>
+
+ <!-- although an in-place upgrade works, Thunderbird then insists on a reboot
+ the next time one tries to start Thunderbird -->
+ <upgrade cmd='taskkill /F /IM thunderbird.exe'>
<exit code="0" />
<exit code="128" />
</upgrade>
@@ -30,7 +32,11 @@
<exit code="0" />
<exit code="128" />
</remove>
- <remove cmd='"%programfileswpkg%\Mozilla Thunderbird\uninstall\helper.exe" -ms' />
+
+ <!-- helper.exe spawns children, and "start /wait" doesn't help -->
+ <remove cmd='cmd /c %software%\wpkg\tools\waitforprocess.cmd Au_.exe' />
+ <remove cmd='"%programfileswpkg%\Mozilla Thunderbird\uninstall\helper.exe" /S' />
+ <remove cmd='cmd /c %software%\wpkg\tools\waitforprocess.cmd Au_.exe' />
</package>
</packages>
--
GitLab