List for cgit developers and users
 help / color / mirror / Atom feed
From: mailings at hupie.com (Ferry Huberts)
Subject: [PATCH v3 RESEND 1/2] highlight: fix commandline options for different highlight versions
Date: Sun, 18 Mar 2012 11:44:16 +0100	[thread overview]
Message-ID: <1332067457-15050-1-git-send-email-mailings@hupie.com> (raw)

From: Ferry Huberts <ferry.huberts at pelagic.nl>

Signed-off-by: Ferry Huberts <ferry.huberts at pelagic.nl>
---
 filters/syntax-highlighting.sh |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 6283ce9..65baaa0 100755
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -42,4 +42,22 @@ EXTENSION="${BASENAME##*.}"
 # map Makefile and Makefile.* to .mk
 [ "${BASENAME%%.*}" == "Makefile" ] && EXTENSION=mk
 
-exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
+#
+# highlight versions 2 and 3 have different commandline options. Specifically,
+# the -X option that is used for version 2 is replaced by the -O xhtml option
+# for version 3.
+#
+# Version 2 can be found (for example) on CentOS 5, while version 3 can be
+# found (for example) on CentOS 6.
+#
+# get highlight version
+regex='^[[:space:]]*highlight[[:space:]]+version[[:space:]]+([[:digit:]]+).*'
+highlightVersion=$(highlight --version | grep -E "${regex}" | sed -r "s/${regex}/\1/")
+
+if [[ ${highlightVersion} -le 2 ]]; then
+  # for highlight versions <= 2.x
+  exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
+else
+  # for highlight versions >= 3.x
+  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 mailings [this message]
2012-03-18 10:44 ` [PATCH v3 RESEND 2/2] highlight: add a workaround for the --force bug mailings
2012-03-18 11:14 ` [PATCH v3 RESEND 1/2] highlight: fix commandline options for different highlight versions 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-1-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).