From 94e6511fa7e5e043d7d88b90ea7786209ab33355 Mon Sep 17 00:00:00 2001
From: Adam Thorn <alt36@cam.ac.uk>
Date: Mon, 9 Mar 2020 15:52:12 +0000
Subject: [PATCH] spri-shortcuts: switch from chem to ucam_wpkg conventions

---
 packages/spri-shortcuts.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/spri-shortcuts.xml b/packages/spri-shortcuts.xml
index 4422e4a0..258e52cc 100755
--- a/packages/spri-shortcuts.xml
+++ b/packages/spri-shortcuts.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--  vim: set softtabstop=3: -->
 <packages>
-   <package id="spri-shortcuts" name="SPRI shortcuts" revision="%version%.1" priority="0" reboot="false">
+   <package id="spri-shortcuts" name="SPRI shortcuts" revision="%version%.2" priority="0" reboot="false">
       <variable name="version" value="1.0" />
 
-      <check type='registry' condition='equals' path='HKLM\software\ch.cam.ac.uk\WPKG\spri-shortcuts' value="%version%"/>
+      <check type='registry' condition='equals' path='HKLM\software\ucam_wpkg.cam.ac.uk\spri-shortcuts\version' value="%version%"/>
 
-      <install cmd='reg add HKLM\software\ch.cam.ac.uk\WPKG /t reg_sz /v spri-shortcuts /d %version% /f'/>
-      <install cmd='cscript %software%\wpkg\tools\create-shortcut.js /folder:"SPRI" /linkname:"SPRI Wiki" /target:"http://wikis.ch.cam.ac.uk/spri/"' />
+      <install cmd='reg add HKLM\software\ucam_wpkg.cam.ac.uk\spri-shortcuts /t reg_sz /v version /d %version% /f'/>
+      <install cmd='cscript %WPKGSOFTWARE%\wpkg\tools\create-shortcut.js /folder:"SPRI" /linkname:"SPRI Wiki" /target:"http://wikis.ch.cam.ac.uk/spri/"' />
 
       <upgrade include='remove' />
       <upgrade include='install' />
 
-      <remove cmd='cscript %software%\wpkg\tools\delete-shortcut.js /folder:"SPRI" /linkname:"SPRI Wiki"'/>
-      <remove cmd='reg delete HKLM\software\ch.cam.ac.uk\WPKG /v spri-shortcuts /f'/>
+      <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'/>
 
 </package>
 </packages>
-- 
GitLab