Modify olex2 for ucam_wpkg conventions

packages/olex2.xml

@@ -10,18 +10,18 @@
             and write them to %programfiles%)
          4) copy %programfiles%\olex2 back to the deploy share complete with pyc files -->
 
-    <check type='registry' condition='equals' path='HKLM\software\ch.cam.ac.uk\WPKG\olex2' value="%version%" />
+    <check type='registry' condition='equals' path='HKLM\software\ucam_wpkg.ch.cam.ac.uk\olex2\version' value="%version%" />
 
-    <install cmd='%software%\wpkg\tools\copydir.cmd "%software%\olex2\%version%" "%programfiles%\olex2"' />
-    <install cmd='cscript %software%\wpkg\tools\create-shortcut.js /folder:"Olex2" /linkname:"Olex2 %version%" /target:"%programfiles%\olex2\olex2.exe"' />
-    <install cmd='reg add HKLM\software\ch.cam.ac.uk\WPKG /t reg_sz /v olex2 /d %version% /f' />
+    <install cmd='%WPKGSOFTWARE%\wpkg\tools\copydir.cmd "%WPKGSOFTWARE%\olex2\%version%" "%programfiles%\olex2"' />
+    <install cmd='cscript %WPKGSOFTWARE%\wpkg\tools\create-shortcut.js /folder:"Olex2" /linkname:"Olex2 %version%" /target:"%programfiles%\olex2\olex2.exe"' />
+    <install cmd='reg add HKLM\software\ucam_wpkg.ch.cam.ac.uk\olex2 /t reg_sz /v version /d %version% /f' />
     
     <upgrade include='remove' />
     <upgrade include='install' />
 
     <remove cmd='cmd /c if exist "%programfiles%\olex2" rmdir /s /q "%programfiles%\olex2"' />
-    <remove cmd='cscript %software%\wpkg\tools\delete-shortcut.js /folder:"Olex2"'/>
-    <remove cmd='reg delete HKLM\software\ch.cam.ac.uk\WPKG /v olex2 /f' />
+    <remove cmd='cscript %WPKGSOFTWARE%\wpkg\tools\delete-shortcut.js /folder:"Olex2"'/>
+    <remove cmd='reg delete HKLM\software\ucam_wpkg.ch.cam.ac.uk\olex2 /f' />
 
   </package>
 </packages>