From mboxrd@z Thu Jan 1 00:00:00 1970 From: mailings at hupie.com (Ferry Huberts) Date: Sun, 18 Mar 2012 11:44:16 +0100 Subject: [PATCH v3 RESEND 1/2] highlight: fix commandline options for different highlight versions Message-ID: <1332067457-15050-1-git-send-email-mailings@hupie.com> From: Ferry Huberts Signed-off-by: Ferry Huberts --- 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