From mboxrd@z Thu Jan 1 00:00:00 1970 From: mailings at hupie.com (Ferry Huberts) Date: Sun, 18 Mar 2012 11:44:17 +0100 Subject: [PATCH v3 RESEND 2/2] highlight: add a workaround for the --force bug In-Reply-To: <1332067457-15050-1-git-send-email-mailings@hupie.com> References: <1332067457-15050-1-git-send-email-mailings@hupie.com> Message-ID: <1332067457-15050-2-git-send-email-mailings@hupie.com> From: Ferry Huberts Signed-off-by: Ferry Huberts --- filters/syntax-highlighting.sh | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh index 65baaa0..cbc3056 100755 --- a/filters/syntax-highlighting.sh +++ b/filters/syntax-highlighting.sh @@ -59,5 +59,23 @@ if [[ ${highlightVersion} -le 2 ]]; then exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null else # for highlight versions >= 3.x + + # + # On CentOS 6.2 (using highlight from EPEL), when highlight doesn't know about + # an EXTENSION, it outputs a lua error and _no_ text, even when the --force + # option is used. + # + # Also see the bug reports at: + # http://sourceforge.net/tracker/?func=detail&aid=3490017&group_id=215618&atid=1034391 + # https://bugzilla.redhat.com/show_bug.cgi?id=795567 + # + # This workaround can be removed when the bug is fixed upstream and the new + # version is packaged in most distributions. + # + # The workaround is to set the extension to 'txt' (plain text) when highlight + # exits with an error (doesn't know the format). + echo "test" | highlight -f -I -O xhtml -S $EXTENSION &>/dev/null + [ ${?} -ne 0 ] && EXTENSION="txt" + exec highlight --force -f -I -O xhtml -S $EXTENSION 2>/dev/null fi -- 1.7.7.6