about summary refs log tree commit diff stats
path: root/filters
diff options
context:
space:
mode:
authorFerry Huberts2012-10-09 13:08:30 +0200
committerJason A. Donenfeld2012-10-09 13:12:09 +0200
commit2ad9063cb53b55b1456c7d2ed08e6fb99d32ab78 (patch)
treee8aa0e248bac6376c5c800f35eec549c83acb6d7 /filters
parentMakefile: add tag target to generate ctags (diff)
downloadcgit-2ad9063cb53b55b1456c7d2ed08e6fb99d32ab78.tar.gz
cgit-2ad9063cb53b55b1456c7d2ed08e6fb99d32ab78.zip
Revert "filters/syntax-highlighting.sh: work around highlight --force bug"
This reverts commit f50be7fda0a7ab57009169dd5905fcbab8eb5166.

An update with the latest highlight landed in EPEL. This new version
doesn't have the --force bug, so the workaround can now be removed.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Diffstat (limited to 'filters')
-rwxr-xr-xfilters/syntax-highlighting.sh17
1 files changed, 0 insertions, 17 deletions
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh index 5fcc9c9..0639b10 100755 --- a/filters/syntax-highlighting.sh +++ b/filters/syntax-highlighting.sh
@@ -53,21 +53,4 @@ EXTENSION="${BASENAME##*.}"
53exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null 53exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
54 54
55# This is for version 3 55# This is for version 3
56#
57# On CentOS 6.2 (using highlight from EPEL), when highlight doesn't know about
58# an EXTENSION, it outputs a lua error and _no_ text, even when the --force
59# option is used.
60#
61# Also see the bug reports at:
62# http://sourceforge.net/tracker/?func=detail&aid=3490017&group_id=215618&atid=1034391
63# https://bugzilla.redhat.com/show_bug.cgi?id=795567
64#
65# This workaround can be removed when the bug is fixed upstream and the new
66# version is packaged in most distributions.
67#
68# The workaround is to set the extension to 'txt' (plain text) when highlight
69# exits with an error (doesn't know the format).
70#
71#echo "test" | highlight -f -I -O xhtml -S $EXTENSION &>/dev/null
72#[ ${?} -ne 0 ] && EXTENSION="txt"
73#exec highlight --force -f -I -O xhtml -S $EXTENSION 2>/dev/null 56#exec highlight --force -f -I -O xhtml -S $EXTENSION 2>/dev/null