Diffstat (limited to 'filters')
| -rwxr-xr-x | filters/commit-links.sh | 7 | ||||
| -rwxr-xr-x | filters/syntax-highlighting.sh | 28 |
2 files changed, 2 insertions, 33 deletions
diff --git a/filters/commit-links.sh b/filters/commit-links.sh index 5881952..d2cd2b3 100755 --- a/filters/commit-links.sh +++ b/filters/commit-links.sh @@ -15,14 +15,11 @@ # CGIT_REPO_CLONE_URL ( = repo.clone-url setting ) # -regex='' - # This expression generates links to commits referenced by their SHA1. regex=$regex' -s|\b([0-9a-fA-F]{7,40})\b|<a href="./?id=\1">\1</a>|g' - +s|\b([0-9a-fA-F]{8,40})\b|<a href="./?id=\1">\1</a>|g' # This expression generates links to a fictional bugtracker. regex=$regex' -s|#([0-9]+)\b|<a href="http://bugs.example.com/?bug=\1">#\1</a>|g' +s| #([0-9]+)\b|<a href="http://bugs.example.com/?bug=\1">#\1</a>|g' sed -re "$regex" diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh index 5fcc9c9..6283ce9 100755 --- a/filters/syntax-highlighting.sh +++ b/filters/syntax-highlighting.sh @@ -42,32 +42,4 @@ EXTENSION="${BASENAME##*.}" # 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 - -# This is for version 3 -# -# 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 |