List for cgit developers and users
 help / color / mirror / Atom feed
From: mailings at hupie.com (Ferry Huberts)
Subject: [PATCH v3 RESEND 2/2] highlight: add a workaround for the --force bug
Date: Sun, 18 Mar 2012 11:44:17 +0100	[thread overview]
Message-ID: <1332067457-15050-2-git-send-email-mailings@hupie.com> (raw)
In-Reply-To: <1332067457-15050-1-git-send-email-mailings@hupie.com>

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





  reply	other threads:[~2012-03-18 10:44 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-18 10:44 [PATCH v3 RESEND 1/2] highlight: fix commandline options for different highlight versions mailings
2012-03-18 10:44 ` mailings [this message]
2012-03-18 11:14 ` larsh
2012-03-18 11:19   ` mailings
2012-03-18 11:30     ` larsh
2012-03-18 11:33       ` mailings

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1332067457-15050-2-git-send-email-mailings@hupie.com \
    --to=cgit@lists.zx2c4.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).