git instaweb for Debian squeeze (Re: Bug#592733: git instaweb broken)
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Sep 2, 2010, 22:12 UTC
- Message-ID
- <20100902221211.GA4789@burratino>
- In-Reply-To
- <20100812131152.2333.9604.reportbug@octopus.hi.pengutronix.de>
Hi again,
Uwe Kleine-König wrote:
> when I start git instaweb on a git repository, I get a crippled view > (no style sheets, no images) that doesn't include the current project.
Ok, so the proper fix is v1.7.2-rc0~55^2~3, but that seems too dramatic to try at the moment for squeeze (for which the plan is to basically go with gitweb and instaweb 1.7.1). Does this workaround help?
Eric, do you think it is worth duplicating the logo and favicon within pre-v1.7.2 instaweb? The script already takes 252 KiB, so an extra 10 KiB might not be such a big deal.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> ---
diff --git a/git-instaweb.sh b/git-instaweb.sh index 0c6e103..95d3d0a 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -387,7 +387,11 @@ script=' s#^(my|our) \$projectroot =.*#$1 \$projectroot = "'$(dirname "$fqgitdir")'";#; s#(my|our) \$gitbin =.*#$1 \$gitbin = "'$GIT_EXEC_PATH'";#; s#(my|our) \$projects_list =.*#$1 \$projects_list = \$projectroot;#; -s#(my|our) \$git_temp =.*#$1 \$git_temp = "'$fqgitdir/gitweb/tmp'";#;' +s#(my|our) \$git_temp =.*#$1 \$git_temp = "'$fqgitdir/gitweb/tmp'";#; +s#(my|our) \$logo =.*#$1 \$logo = "/usr/share/gitweb/git-logo.png";#; +s#(my|our) \$favicon =.*#$1 \$favicon = "/usr/share/gitweb/git-favicon.png";#; +s#(my|our) \$GITWEB_CONFIG_SYSTEM =.*#$1 \$GITWEB_CONFIG_SYSTEM = "";#;' + gitweb_cgi () { cat > "$1.tmp" <<\EOFGITWEB