kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

gitweb: do not use @@FOO@@ for replaced tokens 

This makes it easier to run gitweb/gitweb.perl without token substitution.
Using @@ makes Perl emit "unintended interpolation" warnings.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 2006-08-02 13:50:20 -07:00
parent bb55f77fcd
commit 06c084d28b
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -584,15 +584,15 @@ git-status: git-commit
gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/gitweb.cgi: gitweb/gitweb.perl
rm -f $@ $@+ rm -f $@ $@+
sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \ sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
-e 's|@@GIT_VERSION@@|$(GIT_VERSION)|g' \ -e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \
-e 's|@@GIT_BINDIR@@|$(bindir)|g' \ -e 's|++GIT_BINDIR++|$(bindir)|g' \
-e 's|@@GITWEB_CONFIG@@|$(GITWEB_CONFIG)|g' \ -e 's|++GITWEB_CONFIG++|$(GITWEB_CONFIG)|g' \
-e 's|@@GITWEB_SITENAME@@|$(GITWEB_SITENAME)|g' \ -e 's|++GITWEB_SITENAME++|$(GITWEB_SITENAME)|g' \
-e 's|@@GITWEB_PROJECTROOT@@|$(GITWEB_PROJECTROOT)|g' \ -e 's|++GITWEB_PROJECTROOT++|$(GITWEB_PROJECTROOT)|g' \
-e 's|@@GITWEB_LIST@@|$(GITWEB_LIST)|g' \ -e 's|++GITWEB_LIST++|$(GITWEB_LIST)|g' \
-e 's|@@GITWEB_HOMETEXT@@|$(GITWEB_HOMETEXT)|g' \ -e 's|++GITWEB_HOMETEXT++|$(GITWEB_HOMETEXT)|g' \
-e 's|@@GITWEB_CSS@@|$(GITWEB_CSS)|g' \ -e 's|++GITWEB_CSS++|$(GITWEB_CSS)|g' \
-e 's|@@GITWEB_LOGO@@|$(GITWEB_LOGO)|g' \ -e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \
$< >$@+ $< >$@+
chmod +x $@+ chmod +x $@+
mv $@+ $@ mv $@+ $@

18
gitweb/gitweb.perl
View File

@ -18,18 +18,18 @@ use File::Find qw();
binmode STDOUT, ':utf8'; binmode STDOUT, ':utf8';


our $cgi = new CGI; our $cgi = new CGI;
our $version = "@@GIT_VERSION@@"; our $version = "++GIT_VERSION++";
our $my_url = $cgi->url(); our $my_url = $cgi->url();
our $my_uri = $cgi->url(-absolute => 1); our $my_uri = $cgi->url(-absolute => 1);
our $rss_link = ""; our $rss_link = "";


# core git executable to use # core git executable to use
# this can just be "git" if your webserver has a sensible PATH # this can just be "git" if your webserver has a sensible PATH
our $GIT = "@@GIT_BINDIR@@/git"; our $GIT = "++GIT_BINDIR++/git";


# absolute fs-path which will be prepended to the project path # absolute fs-path which will be prepended to the project path
#our $projectroot = "/pub/scm"; #our $projectroot = "/pub/scm";
our $projectroot = "@@GITWEB_PROJECTROOT@@"; our $projectroot = "++GITWEB_PROJECTROOT++";


# location for temporary files needed for diffs # location for temporary files needed for diffs
our $git_temp = "/tmp/gitweb"; our $git_temp = "/tmp/gitweb";
@ -39,18 +39,18 @@ our $home_link = $my_uri;


# name of your site or organization to appear in page titles # name of your site or organization to appear in page titles
# replace this with something more descriptive for clearer bookmarks # replace this with something more descriptive for clearer bookmarks
our $site_name = "@@GITWEB_SITENAME@@" || $ENV{'SERVER_NAME'} || "Untitled"; our $site_name = "++GITWEB_SITENAME++" || $ENV{'SERVER_NAME'} || "Untitled";


# html text to include at home page # html text to include at home page
our $home_text = "@@GITWEB_HOMETEXT@@"; our $home_text = "++GITWEB_HOMETEXT++";


# URI of default stylesheet # URI of default stylesheet
our $stylesheet = "@@GITWEB_CSS@@"; our $stylesheet = "++GITWEB_CSS++";
# URI of GIT logo # URI of GIT logo
our $logo = "@@GITWEB_LOGO@@"; our $logo = "++GITWEB_LOGO++";


# source of projects list # source of projects list
our $projects_list = "@@GITWEB_LIST@@"; our $projects_list = "++GITWEB_LIST++";


# default blob_plain mimetype and default charset for text/plain blob # default blob_plain mimetype and default charset for text/plain blob
our $default_blob_plain_mimetype = 'text/plain'; our $default_blob_plain_mimetype = 'text/plain';
@ -60,7 +60,7 @@ our $default_text_plain_charset = undef;
# (relative to the current git repository) # (relative to the current git repository)
our $mimetypes_file = undef; our $mimetypes_file = undef;


our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "@@GITWEB_CONFIG@@"; our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";
require $GITWEB_CONFIG if -e $GITWEB_CONFIG; require $GITWEB_CONFIG if -e $GITWEB_CONFIG;


# version of the core git binary # version of the core git binary