Revert "filters/syntax-highlighting.sh: work around highlight --force bug"

[ps-cgit] / filters / syntax-highlighting.sh

diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 6b1c576404f886b9368b6147cf1e83cae819f274..0639b100e7fb6e44cf272eddd5d1ce46bfbdfeba 100755 (executable)
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -23,6 +23,17 @@
 # table.blob .kwb  { color:#830000; }
 # table.blob .kwc  { color:#000000; font-weight:bold; }
 # table.blob .kwd  { color:#010181; }
 # table.blob .kwb  { color:#830000; }
 # table.blob .kwc  { color:#000000; font-weight:bold; }
 # table.blob .kwd  { color:#010181; }

+#
+# The following environment variables can be used to retrieve the configuration
+# of the repository for which this script is called:
+# CGIT_REPO_URL        ( = repo.url       setting )
+# CGIT_REPO_NAME       ( = repo.name      setting )
+# CGIT_REPO_PATH       ( = repo.path      setting )
+# CGIT_REPO_OWNER      ( = repo.owner     setting )
+# CGIT_REPO_DEFBRANCH  ( = repo.defbranch setting )
+# CGIT_REPO_SECTION    ( = section        setting )
+# CGIT_REPO_CLONE_URL  ( = repo.clone-url setting )
+#

 
 # store filename and extension in local vars
 BASENAME="$1"
 
 # store filename and extension in local vars
 BASENAME="$1"


@@ -31,4 +42,15 @@ EXTENSION="${BASENAME##*.}"
 # map Makefile and Makefile.* to .mk
 [ "${BASENAME%%.*}" == "Makefile" ] && EXTENSION=mk
 
 # map Makefile and Makefile.* to .mk
 [ "${BASENAME%%.*}" == "Makefile" ] && EXTENSION=mk
 

+# 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 EPEL 5, while version 3 can be
+# found (for example) on EPEL 6.
+#
+# This is for version 2

 exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
 exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null

+
+# This is for version 3
+#exec highlight --force -f -I -O xhtml -S $EXTENSION 2>/dev/null