On Mon, 20 Sep 2010, Christopher Wilson wrote: > Allow build-time/run-time configuration of the highlight executable. Defaults > to previous behavior which assumes that highlight is available on the server > PATH. However, if this is not the case, the path to the highlight executable > can be configured at build time as a configuration variable > > HIGHLIGHT_BIN = /path/to/highlight > > or at runtime by configuring GITWEB_CONFIG > > $highlight_bin = /path/to/highlight > > Signed-off-by: Christopher Wilson <cwilson@xxxxxxxxxxx> Good idea... but I am not sure about shell quoting and the problem with spaces in pathnames. See comments below. > --- > gitweb/Makefile | 4 +++- > gitweb/README | 7 ++++++- > gitweb/gitweb.perl | 6 +++++- > 3 files changed, 14 insertions(+), 3 deletions(-) > diff --git a/gitweb/README b/gitweb/README > index d481198..69f9860 100644 > --- a/gitweb/README > +++ b/gitweb/README > @@ -114,6 +114,9 @@ You can specify the following configuration variables when building GIT: > when gitweb.cgi is executed, then the file specified in the environment > variable will be loaded instead of the file specified when gitweb.cgi was > created. [Default: /etc/gitweb.conf] > + * HIGHLIGHT_BIN > + Path to the highlight executable to use. Useful if highlight is not > + installed on your webserver's PATH. [Default: highlight] I think it needs to be said that this 'highlight' executable must be the one from http://www.andre-simon.de (assumptions about parameters and output). > diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl > index a85e2f6..e808485 100755 > --- a/gitweb/gitweb.perl > +++ b/gitweb/gitweb.perl [...] > @@ -3360,7 +3364,7 @@ sub run_highlighter { > close $fd > or die_error(404, "Reading blob failed"); > open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ". > - "highlight --xhtml --fragment --syntax $syntax |" > + "$highlight_bin --xhtml --fragment --syntax $syntax |" I think you need + quote_command($highlight_bin)." --xhtml --fragment --syntax $syntax |" here > or die_error(500, "Couldn't open file or run syntax highlighter"); > return $fd; > } > -- > 1.7.2.3 > > -- Jakub Narebski Poland -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html