[prev in list] [next in list] [prev in thread] [next in thread]
List: cgit
Subject: [PATCH v3 RESEND 2/2] highlight: add a workaround for the --force bug
From: mailings () hupie ! com (Ferry Huberts)
Date: 2012-03-18 10:44:17
Message-ID: 1332067457-15050-2-git-send-email-mailings () hupie ! com
[Download RAW message or body]
From: Ferry Huberts <ferry.huberts at pelagic.nl>
Signed-off-by: Ferry Huberts <ferry.huberts at pelagic.nl>
---
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
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic