diff --git a/packages/acrobatreaderdc.xml b/packages/acrobatreaderdc.xml index 07093c561795a14b7b7d720339075b75a9f75867..65870719c02907052dee0117beef64b5d84a23a5 100755 --- a/packages/acrobatreaderdc.xml +++ b/packages/acrobatreaderdc.xml @@ -5,14 +5,13 @@ <package id="acrobatreaderdc" name="Adobe Reader DC" revision="%version%.1" priority="50"> <variable name="version" value="20.006.20042" /> - <variable name="mainversion" value="2000620042" /> - <variable name="patchversion" value="2000620042" /> <!-- this may be the same version as mainversion --> + <variable name="patchversion" value="2000620042" /> <variable name="mstpath" value="%WPKGSHAREBASE%\%WPKGINSTITUTION%-config\Adobe\AcrobatReaderDC\%WPKGINSTITUTION%.mst" /> <check type="uninstall" condition="versiongreaterorequal" path="Adobe Acrobat Reader DC" value="%version%" /> <!-- patches are cumulative; we only need to apply the latest one --> <!-- use mst as a TRANSFORM(s) if present.... --> - <install cmd='msiexec /qn /i "%WPKGSOFTWARE%\Adobe\AcrobatReaderDC\%mainversion%\AcroRead.msi" /l* %WPKGLOGDIR%\ReaderDC.log TRANSFORMS="%mstpath%"'> + <install cmd='msiexec /qn /i "%WPKGSOFTWARE%\Adobe\AcrobatReaderDC\%patchversion%\AcroRead.msi" /l* %WPKGLOGDIR%\ReaderDC.log TRANSFORMS="%mstpath%"'> <exit code="0" /> <exit code="3010" reboot="false" /> <condition> @@ -21,7 +20,7 @@ </install> <!-- ...but no TRANSFORMS if we don't have the mst --> - <install cmd='msiexec /qn /i "%WPKGSOFTWARE%\Adobe\AcrobatReaderDC\%mainversion%\AcroRead.msi" /l* %WPKGLOGDIR%\ReaderDC.log '> + <install cmd='msiexec /qn /i "%WPKGSOFTWARE%\Adobe\AcrobatReaderDC\%patchversion%\AcroRead.msi" /l* %WPKGLOGDIR%\ReaderDC.log '> <exit code="0" /> <exit code="3010" reboot="false" /> <condition>