diff --git a/packages/mathematica.xml b/packages/mathematica.xml index 10c3acf0358d0c8d01fed3aa43daadbd18d8c734..d0e7af6dea92a057865ec1408b9771c70e43b86e 100755 --- a/packages/mathematica.xml +++ b/packages/mathematica.xml @@ -3,10 +3,10 @@ <package id="mathematica" name="Mathematica" revision="%version%.1" reboot="false" priority="0"> <variable name="major" value="14" /> - <variable name="minor" value="1" /> + <variable name="minor" value="2" /> <variable name="sub" value="0" /> <variable name="version" value="%major%.%minor%.%sub%" /> - <check type="uninstall" condition="versiongreaterorequal" path="Wolfram %major%.+" value="%version%" /> + <check type="uninstall" condition="versiongreaterorequal" path="Wolfram %major%.%minor%.+" value="%version%" /> <install cmd='%WPKGSOFTWARE%\wolfram\mathematica\%version%\setup.exe /verysilent /suppressmsgboxes' /> @@ -44,12 +44,24 @@ </condition> </remove> + <remove cmd='"%ProgramFiles%\Wolfram Research\Wolfram\14.1\SystemFiles\UninstallFiles\Windows\unins000.exe" /VERYSILENT /suppressmsgboxes'> + <condition> + <check type="file" condition="exists" path="%ProgramFiles%\Wolfram Research\Wolfram\14.1\SystemFiles\UninstallFiles\Windows\unins000.exe" /> + </condition> + </remove> + <!-- Uninstall this Mathematica --> <remove cmd='"%ProgramFiles%\Wolfram Research\Wolfram\%major%.%minor%\SystemFiles\UninstallFiles\Windows\unins000.exe" /VERYSILENT /suppressmsgboxes'> <condition> <check type="file" condition="exists" path="%ProgramFiles%\Wolfram Research\Wolfram\%major%.%minor%\SystemFiles\UninstallFiles\Windows\unins000.exe" /> </condition> </remove> + <!-- uninstall wolframscript --> + <remove cmd='msiexec /qn /x {2DF07200-A7A7-11EF-BD38-00155D3D8248}'> + <condition> + <check type="uninstall" condition="versiongreaterorequal" path="WolframScript.+" value="%version" /> + </condition> + </remove> </package> </packages:packages>