From f8492f79a3b1193ae1a412eb7c4f3b0c2b21ecaa Mon Sep 17 00:00:00 2001 From: Ferry Huberts Date: Sun, 18 Mar 2012 11:43:49 +0100 Subject: [PATCH 1/4] tests: handle paths with whitespace v2: incorporate remarks of Lukas Signed-off-by: Ferry Huberts --- tests/setup.sh | 2 +- tests/t0108-patch.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/setup.sh b/tests/setup.sh index b9475a3..f5774e3 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -41,7 +41,7 @@ mkrepo() { git commit -m "add a+b" git branch "1+2" fi - cd $dir + cd "$dir" } setup_repos() diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh index e608104..6ee70b3 100755 --- a/tests/t0108-patch.sh +++ b/tests/t0108-patch.sh @@ -25,7 +25,7 @@ run_test 'find `cgit` signature' ' ' run_test 'find initial commit' ' - root=$(git --git-dir=$PWD/trash/repos/foo/.git rev-list HEAD | tail -1) + root=$(git --git-dir="$PWD/trash/repos/foo/.git" rev-list HEAD | tail -1) ' run_test 'generate patch for initial commit' ' From 561959cffa3de67986d193469b77c8db0d307400 Mon Sep 17 00:00:00 2001 From: Ferry Huberts Date: Sun, 18 Mar 2012 11:43:50 +0100 Subject: [PATCH 2/4] tests: properly quote arguments to printf v2: incorporate remarks of Lukas Signed-off-by: Ferry Huberts --- tests/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/setup.sh b/tests/setup.sh index f5774e3..651f940 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -22,7 +22,7 @@ mkrepo() { count=$2 dir=$PWD test -d "$name" && return - printf "Creating testrepo %s\n" $name + printf "Creating testrepo %s\n" "$name" mkdir -p "$name" cd "$name" git init From 375353caffb0a251e7f0174aa9b73cc1961e93fd Mon Sep 17 00:00:00 2001 From: Ferry Huberts Date: Sun, 18 Mar 2012 11:38:26 +0000 Subject: [PATCH 3/4] filters/highlight.sh: manually support highlight version 2 and 3 --- filters/syntax-highlighting.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh index 6b1c576..3fe7fa1 100755 --- a/filters/syntax-highlighting.sh +++ b/filters/syntax-highlighting.sh @@ -31,4 +31,15 @@ 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 +#exec highlight --force -f -I -O xhtml -S $EXTENSION 2>/dev/null From f50be7fda0a7ab57009169dd5905fcbab8eb5166 Mon Sep 17 00:00:00 2001 From: Ferry Huberts Date: Sun, 18 Mar 2012 11:48:01 +0000 Subject: [PATCH 4/4] filters/syntax-highlighting.sh: work around highlight --force bug --- filters/syntax-highlighting.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh index 3fe7fa1..0acdf12 100755 --- a/filters/syntax-highlighting.sh +++ b/filters/syntax-highlighting.sh @@ -42,4 +42,21 @@ EXTENSION="${BASENAME##*.}" 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