make prettydiff available via parameter

instead of trying to install when necessary

.github/workflows/docker-testing.yml

@@ -9,10 +9,10 @@ jobs:
 
     steps:
       - name: Setup
-        run: sudo apt-get install libsaxonhe-java && npm install prettydiff 
+        run: sudo apt-get install libsaxonhe-java && npm install -g prettydiff 
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Build and run Docker image
         run: ant docker_run
       - name: Run tests
-        run: ant -lib /usr/share/java test
+        run: ant -lib /usr/share/java -Dprettydiff.cmd=`which prettydiff` test

build.properties

@@ -10,8 +10,9 @@ dist.dir=dist
 tmp.dir=tmp
 frontend_libs.dir=libs
 dev_libs.dir=node_modules
-sass.cmd=node_modules/sass/sass.js
+sass.cmd=${dev_libs.dir}/sass/sass.js
 yarn.cmd=yarn
+prettydiff.cmd=${dev_libs.dir}/prettydiff/bin/prettydiff
 bash.command=/bin/bash
 wega.fonts.dir=/opt/wega-non-free/fonts
 wega.img.dir=/opt/wega-non-free/img

testing/ant-testing.xml

@@ -55,23 +55,13 @@
         </exec>
     </target>
 
-    <target name="check-prettydiff">
-        <condition property="prettydiff.available" value="true">
-            <length file="${dev_libs.dir}/prettydiff/bin/prettydiff" when="ne" length="0" />
-        </condition>
-    </target>
-
-    <target name="update-prettydiff" depends="check-prettydiff" unless="prettydiff.available">
-        <antcall target="yarn"/>
-    </target>
-
-    <target name="diff" depends="update-prettydiff">
+    <target name="diff">
         <xslt processor="trax" style="testing/flatten.xsl" basedir="${expected.results.dir}/${docType}" destdir="${tmp.dir}/expected.results.processed/${docType}"/>
         <xslt processor="trax" style="testing/flatten.xsl" basedir="${tmp.dir}/results.raw/${docType}" destdir="${tmp.dir}/results.processed/${docType}"/>
         <tempfile property="diff.out" destdir="${tmp.dir}" suffix=".txt" deleteonexit="false"/>
         <exec executable="${bash.command}" output="${diff.out}">
             <arg value="-c"/>
-            <arg value="for i in ${tmp.dir}/expected.results.processed/${docType}/* ; do echo &quot;File: $i&quot;; ${dev_libs.dir}/prettydiff/bin/prettydiff source:&quot;$i&quot; diff:&quot;${tmp.dir}/results.processed/${docType}/`basename $i`&quot; diffcli:&quot;true&quot;  mode:&quot;diff&quot; ; done"/>
+            <arg value="for i in ${tmp.dir}/expected.results.processed/${docType}/* ; do echo &quot;File: $i&quot;; ${prettydiff.cmd} source:&quot;$i&quot; diff:&quot;${tmp.dir}/results.processed/${docType}/`basename $i`&quot; diffcli:&quot;true&quot;  mode:&quot;diff&quot; ; done"/>
             <!--            <arg value="for i in ${expected.results.dir}/${docType}/* ; do echo -e '******************\nPROCESSING' `basename $i`'\n******************' ; diff -B &lt;(saxon -s:$i -xsl:flatten.xsl) &lt;(saxon -s:${results.dir}/${docType}/`basename $i` -xsl:flatten.xsl) ; done"/>-->
             <env key="LANG" value="C"/>
         </exec>