thunderbird: replace some refs to chemistry with more generic "institute-specific"

packages/thunderbird.xml

@@ -3,7 +3,7 @@
 
   <package id="thunderbird" name="Mozilla Thunderbird" revision="%version%.1" reboot="false" priority="81">
 
-    <!-- NB: we've had problems with major version bumps which sometimes change the format of options we add in chemistry-prefs.js.
+    <!-- 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.8.0" />  <!-- For Maths, set version value in package id thunderbird_config_maths to the same as this VERSION -->
@@ -17,22 +17,26 @@
 
     <!-- Installing 32 bit version while Add-on's all move to 64 bit -->
     <install cmd='"%WPKGSOFTWARE%\thunderbird\Thunderbird Setup %version%.exe" -ms' />
-    <!-- a few Chemistry tweaks -->
-    <install cmd='cmd /c copy %WPKGSHAREBASE%\%WPKGINSTITUTION%-config\thunderbird\chemistry-prefs.js-%prefsversion% "%programfiles(x86)%\mozilla thunderbird\defaults\pref\chemistry-prefs.js" '>
+
+    <!-- optional institution-specific tweaks -->
+    <install cmd='cmd /c copy %WPKGSHAREBASE%\%WPKGINSTITUTION%-config\thunderbird\%WPKGINSTITUTION%-prefs.js-%prefsversion% "%programfiles(x86)%\mozilla thunderbird\defaults\pref\%WPKGINSTITUTION%-prefs.js" '>
       <condition>
-         <check type="file" condition="exists" path="%WPKGSHAREBASE%\%WPKGINSTITUTION%-config\thunderbird\chemistry-prefs.js-%prefsversion%" />
+         <check type="file" condition="exists" path="%WPKGSHAREBASE%\%WPKGINSTITUTION%-config\thunderbird\%WPKGINSTITUTION%-prefs.js-%prefsversion%" />
       </condition>
     </install>
+
     <install cmd='cmd /c copy "%WPKGSHAREBASE%\%WPKGINSTITUTION%-config\thunderbird\cam.ac.uk.xml" "%programfiles(x86)%\mozilla thunderbird\isp\cam.ac.uk.xml" '>
       <condition>
          <check type="file" condition="exists" path="%WPKGSHAREBASE%\%WPKGINSTITUTION%-config\thunderbird\cam.ac.uk.xml" />
       </condition>
     </install>
+
     <install cmd='%WPKGSOFTWARE%\wpkg\tools\copydir.cmd "%WPKGSHAREBASE%\%WPKGINSTITUTION%-config\thunderbird\dictionaries" "%programfiles(x86)%\mozilla thunderbird\dictionaries"' >
       <condition>
          <check type="file" condition="exists" path="%WPKGSHAREBASE%\%WPKGINSTITUTION%-config\thunderbird\dictionaries" />
       </condition>
     </install>
+
     <install cmd='reg add HKLM\SOFTWARE\Policies\Mozilla\Thunderbird /t reg_dword /v DisableAppUpdate /d 1 /f'/>
 
     <!-- although an in-place upgrade works, Thunderbird then insists on a reboot the next time one tries to start Thunderbird -->