Mathematica -> v%major%.%minor%.%sub%

mathematica.xml

@@ -2,10 +2,12 @@
 <packages>
 <package id="mathematica" name="Mathematica" revision="%version%.1" reboot="false" priority="0">
  
-  <variable name="version" value="11.0.1" />
-  <variable name="majorversion" value="11" />
+  <variable name="major" value="11" />
+  <variable name="minor" value="1" />
+  <variable name="sub" value="1" />
+  <variable name="version" value="%major%.%minor%.%sub%" />
   <!-- 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 11 (M-WIN-L 11.0.1 5597744)" value="%version%" />
+  <check type="uninstall" condition="versiongreaterorequal" path="Wolfram Mathematica %version% (M-WIN-L %version% 5716995)" value="%version%" />
 
   <!-- 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'>
@@ -14,16 +16,16 @@
   <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 "%ProgramData%\Mathematica\Licensing" '>
+  <install cmd='%SOFTWARE%\wolfram\mathematica\%version%\setup.exe /verysilent /suppressmsgboxes'>
+  <!-- Dont think we need to do this <install cmd='cmd /c mkdir "%ProgramData%\Mathematica\Licensing" '> -->
    <exit code='1'/>
   </install>
 
   <!-- 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" '/>
+  <install cmd='cmd /c copy %SOFTWARE%\wolfram\mathematica\mathpass "%programfiles%\Wolfram Research\Mathematica\%major%.%minor%\Configuration\Licensing\mathpass" '/>
 
 
-  <upgrade cmd='cmd /c taskkill /f /im "mathkernel.exe"'>
+  <upgrade cmd='cmd /c taskkill /f /im "wolframkernel.exe"'>
     <exit code='128'/>
   </upgrade>
 
@@ -32,15 +34,15 @@
   </upgrade>
   <upgrade include="install" />
 
-  <remove cmd='"%ProgramFiles%\Wolfram Research\Mathematica\11.0\SystemFiles\UninstallFiles\Windows\unins000.exe" /VERYSILENT'>
+  <!-- Uninstall the Extras -->
+  <remove cmd='"%ProgramData%\Mathematica\Applications\SystemFiles\UninstallFiles\Windows\unins000.exe" /VERYSILENT /suppressmsgboxes'>
    <exit code="9009"/>
   </remove>
-  <remove cmd='"%ProgramFiles(x86)%\Wolfram Research\Mathematica\11.0\SystemFiles\UninstallFiles\Windows\unins000.exe" /VERYSILENT'>
+
+  <!-- Uninstall Mathematica -->
+  <remove cmd='"%ProgramFiles%\Wolfram Research\Mathematica\%major%.%minor%\SystemFiles\UninstallFiles\Windows\unins000.exe" /VERYSILENT /suppressmsgboxes'>
    <exit code="9009"/>
   </remove>
 
-  <remove cmd='"%ProgramFiles%\Extras\UninstallFiles\Windows\unins000.exe" /VERYSILENT'/>
-  <remove cmd='"%ProgramFiles(x86)%\Extras\UninstallFiles\Windows\unins000.exe" /VERYSILENT'/>
-
 </package>
 </packages>