spri-shortcuts: improve reg key tidying on removal

packages/spri-shortcuts.xml

@@ -13,7 +13,20 @@
       <upgrade include='install' />
 
       <remove cmd='cscript %WPKGSOFTWARE%\wpkg\tools\delete-shortcut.js /folder:"SPRI" /linkname:"SPRI Wiki"'/>
-      <remove cmd='reg delete HKLM\software\ucam_wpkg.cam.ac.uk /v spri-shortcuts /f'/>
+
+      <!-- NB the chem repo-only version of this package used the ch.cam.ac.uk key, but now we're using
+           the ucam_wpkg.cam.ac.uk variant. Tidy up both versions of removal if they exist -->
+      <remove cmd='reg delete HKLM\software\ucam_wpkg.cam.ac.uk\spri-shortcuts /f'>
+        <condition>
+          <check type='registry' condition='exists' path='HKLM\software\ucam_wpkg.cam.ac.uk\spri-shortcuts' />
+        </condition>
+      </remove>
+
+      <remove cmd='reg delete HKLM\software\ch.cam.ac.uk\WPKG /v spri-shortcuts /f'>
+        <condition>
+          <check type='registry' condition='exists' path='HKLM\software\ch.cam.ac.uk\WPKG\spri-shortcuts' />
+        </condition>
+      </remove>
 
 </package>
 </packages>