From e8e5a862c0d7ae1267edadc8c732fd9d3f6515c6 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 7 Apr 2021 17:56:11 +0100 Subject: [PATCH] AHBKM1024A-88 - Compare json files in windows --- differences/file.groovy | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/differences/file.groovy b/differences/file.groovy index ab4102f..bfb8407 100644 --- a/differences/file.groovy +++ b/differences/file.groovy @@ -1,15 +1,22 @@ def comparefiles(importedfile, currentfile, boolean ignorewhitespace = true) { + def wsparameter = "-w" + if (!ignorewhitespace) { + wsparameter = "" + } if (isUnix()) { - def wsparameter = "-w" - if (!ignorewhitespace) { - wsparameter = "" - } sh """ diff -c ${wsparameter} "${importedfile}" "${currentfile}" """ } else { - error "Windows not currently supporting file comparison" + // diffutils can be installed on windows with chocolatey + bat """ + REM echo Checking utilities exist + where diff + if errorlevel 1 EXIT /b 1 + + diff -c ${wsparameter} "${importedfile}" "${currentfile}" + """ } }