diff --git a/packages/anaconda3.xml b/packages/anaconda3.xml index d46c0722eb3fe0757ee702b2826a34f48eefb38b..e6c2ef0ea6a9c938960f3cfef1d12e6e0c6505a5 100755 --- a/packages/anaconda3.xml +++ b/packages/anaconda3.xml @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <packages> - <package id="anaconda3" name="Anaconda (Python 3.5)" revision="%version%.1" priority="0" reboot="false"> - <variable name="version" value="4.1.1" /> + <package id="anaconda3" name="Anaconda (Python 3.7)" revision="%version%.1" priority="0" reboot="false"> + <variable name="version" value="2020.02" /> <!-- installer puts uninstall info in HKCU rather than HKLM, which wpkg does not search. Thus, provide our own registry key --> - <check type='registry' condition='equals' path='HKLM\software\ch.cam.ac.uk\WPKG\anaconda3' value="%version%"/> + <check type='registry' condition='equals' path='HKLM\software\ucam_wpkg.cam.ac.uk\WPKG\anaconda3' value="%version%"/> - <install cmd='%software%\anaconda\Anaconda3-%version%-Windows-x86_64.exe /S /InstallationType=AllUsers /D=c:\anaconda3' /> - <install cmd='reg add HKLM\software\ch.cam.ac.uk\WPKG /t reg_sz /v anaconda3 /d %version% /f'/> + <install cmd='%WPKGSOFTWARE%\anaconda\Anaconda3-%version%-Windows-x86_64.exe /S /InstallationType=AllUsers /D=c:\anaconda3' /> + <install cmd='reg add HKLM\software\ucam_wpkg.cam.ac.uk\WPKG /t reg_sz /v anaconda3 /d %version% /f'/> <upgrade include="remove" /> <upgrade include="install" /> - <remove cmd='cmd /c %software%\wpkg\tools\waitforprocess.cmd Au_.exe' /> - <remove cmd='c:\anaconda3\uninstall-anaconda.exe /S' /> - <remove cmd='cmd /c %software%\wpkg\tools\waitforprocess.cmd Au_.exe' /> + <remove cmd='cmd /c %WPKGSOFTWARE%\wpkg\tools\waitforprocess.cmd Un_A.exe' /> + <remove cmd='c:\anaconda3\uninstall-anaconda3.exe /S' /> + <remove cmd='cmd /c %WPKGSOFTWARE%\wpkg\tools\waitforprocess.cmd Un_A.exe' /> - <remove cmd='reg delete HKLM\software\ch.cam.ac.uk\WPKG /v anaconda3 /f'/> + <remove cmd='reg delete HKLM\software\ucam_wpkg.cam.ac.uk\WPKG /v anaconda3 /f'/> </package> </packages>