From fa5a0e70640118cc7f9fac0ccc95da7579c57bd1 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Sun, 10 Feb 2008 21:15:05 +0000 Subject: [PATCH] Fix for systems with old non-POSIX awk. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/buildbot/tools/check.sh | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/build/buildbot/tools/check.sh b/build/buildbot/tools/check.sh index 0a734558d1..874bf7bf10 100755 --- a/build/buildbot/tools/check.sh +++ b/build/buildbot/tools/check.sh @@ -62,6 +62,24 @@ PREP="$WORKDIR/PREP" STDERR="$WORKDIR/STDERR" ERR=0 +# Filter to show lines of genertated XSLT when they are mentioned. +showxslt() { + awk '{ + print; + if (sub(/.*generated XSLT line */, "") && sub(/[^0-9].*/, "")) + { + system("sed -ne "$0"p '$XSLT'"); + } + }' +} + +# Test it works as old version of awk don't have sub or system functions. +if showxslt /dev/null; then + SHOWXSLT=showxslt +else + SHOWXSLT=cat +fi + # Change the names of the temporary files in an error message to something # to something more informative errout() @@ -71,14 +89,7 @@ errout() if [ -s "$STDERR" ]; then sed "s|file ${WORKPAT}|${WORKPAT}|g;\ s|${WORKPAT}/XSLT|generated XSLT|g;\ - s|${WORKPAT}/PREP|$NAME (preprocessed)|g" "$STDERR" | - awk '{ - print; - if (sub(/.*generated XSLT line */, "") && sub(/[^0-9].*/, "")) - { - system("sed -ne "$0"p '$XSLT'"); - } - }' + s|${WORKPAT}/PREP|$NAME (preprocessed)|g" "$STDERR" | $SHOWXSLT fi } -- 2.50.0