From ae4a780a7f04602dfbd2e8c4a4e9cd6a912d8ab6 Mon Sep 17 00:00:00 2001
From: Charles Callow <cwc50@wpkg-xml.ch.private.cam.ac.uk>
Date: Fri, 6 Jan 2017 10:59:54 +0000
Subject: [PATCH] Mathematica -> v11.0.1

---
 mathematica.xml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)
 mode change 100755 => 100644 mathematica.xml

diff --git a/mathematica.xml b/mathematica.xml
old mode 100755
new mode 100644
index 7abf1a07..5dd8c46d
--- a/mathematica.xml
+++ b/mathematica.xml
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <packages>
-<package id="mathematica" name="Mathematica" revision="%version%.13" reboot="false" priority="30">
+<package id="mathematica" name="Mathematica" revision="%version%.1" reboot="false" priority="0">
  
-  <variable name="version" value="10.4.1" />
-  <variable name="majorversion" value="10" />
+  <variable name="version" value="11.0.1" />
+  <variable name="majorversion" value="11" />
   <!-- Wildcards in path do not work, empirically, so even though wpkg for v10.0 used them I am not -->
-  <check type="uninstall" condition="versiongreaterorequal" path="Wolfram Mathematica 10.4 (M-WIN-L 10.4.1 5514214)" value="%version%" />
+  <check type="uninstall" condition="versiongreaterorequal" path="Wolfram Mathematica 11 (M-WIN-L 11.0.1 5597744)" value="%version%" />
 
-  <!-- mathematica seems to complain if it can't run this uninstaller?! -->
-<!--   <install cmd='cmd /c if exist "%AllUsersProfile%\Application Data\Mathematica\Applications\Extras\UninstallFiles\Windows\unins000.exe" "%AllUsersProfile%\Application Data\Mathematica\Applications\Extras\UninstallFiles\Windows\unins000.exe" /silent'/> -->
-
-  <!-- attempt to uninstall 10.1, first; if there's an error it's probably because it's not there -->
-  <install cmd='"%programfiles%\Wolfram Research\Mathematica\10.1\SystemFiles\UninstallFiles\Windows\unins000.exe" /VERYSILENT'>
+  <!-- attempt to uninstall 10.4, first; if there's an error it's probably because it's not there -->
+  <install cmd='"%programfiles%\Wolfram Research\Mathematica\10.4\SystemFiles\UninstallFiles\Windows\unins000.exe" /VERYSILENT'>
 		 <exit code='any'/>
 	</install>
   <install cmd='"%programfiles%\Extras\uninstallfiles\windows\unins000.exe" /VERYSILENT'>
 		 <exit code='any'/>
 	</install>
   <install cmd='%SOFTWARE%\wolfram\mathematica\%version%\setup.exe /verysilent /suppressmsgboxes'/>
-  <install cmd='cmd /c mkdir "%AllUsersProfile%\Application Data\Mathematica\Licensing" '>
+  <install cmd='cmd /c mkdir "%ProgramData%\Mathematica\Licensing" '>
    <exit code='1'/>
   </install>
 
-  <install cmd='cmd /c copy %SOFTWARE%\wolfram\mathematica\mathpass "%AllUsersProfile%\Application Data\Mathematica\Licensing\mathpass" '/>
+  <!-- Place mathpass in the default location for global password (different directory to <=10.x!) --> 
+  <install cmd='cmd /c copy %SOFTWARE%\wolfram\mathematica\mathpass "%ProgramData%\Mathematica\Licensing\mathpass" '/>
 
 
   <upgrade cmd='cmd /c taskkill /f /im "mathkernel.exe"'>
@@ -34,10 +32,10 @@
   </upgrade>
   <upgrade include="install" />
 
-  <remove cmd='"%ProgramFiles%\Wolfram Research\Mathematica\10.4\SystemFiles\UninstallFiles\Windows\unins000.exe" /VERYSILENT'>
+  <remove cmd='"%ProgramFiles%\Wolfram Research\Mathematica\11.0\SystemFiles\UninstallFiles\Windows\unins000.exe" /VERYSILENT'>
    <exit code="9009"/>
   </remove>
-  <remove cmd='"%ProgramFiles(x86)%\Wolfram Research\Mathematica\10.4\SystemFiles\UninstallFiles\Windows\unins000.exe" /VERYSILENT'>
+  <remove cmd='"%ProgramFiles(x86)%\Wolfram Research\Mathematica\11.0\SystemFiles\UninstallFiles\Windows\unins000.exe" /VERYSILENT'>
    <exit code="9009"/>
   </remove>
 
-- 
GitLab