From 390b67b8ba5b6deeca02f6af789f516d31746eef Mon Sep 17 00:00:00 2001
From: Adam Thorn <alt36@cam.ac.uk>
Date: Thu, 9 Apr 2020 16:21:36 +0100
Subject: [PATCH] Make acrobatreaderdc.xml compliant with packages.xsd
wpkg's packages.xsd specifies that we should order elements as
<install><condition /><exit /></install>
rather than
<install><exit /><condition /></install>
---
packages/acrobatreaderdc.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/acrobatreaderdc.xml b/packages/acrobatreaderdc.xml
index 45e17ebf..cd7ca591 100755
--- a/packages/acrobatreaderdc.xml
+++ b/packages/acrobatreaderdc.xml
@@ -12,20 +12,20 @@
<!-- 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\%patchversion%\AcroRead.msi" /l* %WPKGLOGDIR%\ReaderDC.log TRANSFORMS="%mstpath%"'>
- <exit code="3010" reboot="false" />
<condition>
<check type="file" condition="exists" path="%mstpath%" />
</condition>
+ <exit code="3010" reboot="false" />
</install>
<!-- ...but no TRANSFORMS if we don't have the mst -->
<install cmd='msiexec /qn /i "%WPKGSOFTWARE%\Adobe\AcrobatReaderDC\%patchversion%\AcroRead.msi" /l* %WPKGLOGDIR%\ReaderDC.log '>
- <exit code="3010" reboot="false" />
<condition>
<check type="logical" condition="not">
<check type="file" condition="exists" path="%mstpath%" />
</check>
</condition>
+ <exit code="3010" reboot="false" />
</install>
<install cmd='msiexec /qn /l* %WPKGLOGDIR%\ReaderDC-p1.log /update "%WPKGSOFTWARE%\Adobe\AcrobatReaderDC\AcroRdrDCUpd%patchversion%.msp"'>
--
GitLab