From 3c7fddd4910378ef6c323cea0fd1f3f149dcda06 Mon Sep 17 00:00:00 2001
From: Adam Thorn <alt36@cam.ac.uk>
Date: Fri, 6 Mar 2020 15:13:15 +0000
Subject: [PATCH] Modify olex2 for ucam_wpkg conventions
---
packages/olex2.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/packages/olex2.xml b/packages/olex2.xml
index 6d11182a..e97682af 100755
--- a/packages/olex2.xml
+++ b/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>
--
GitLab