From: Junio C Hamano Date: Wed, 2 Aug 2006 20:50:20 +0000 (-0700) Subject: gitweb: do not use @@FOO@@ for replaced tokens X-Git-Tag: v1.4.3-rc1~274^2~19 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=06c084d28b150ac1e2ed0c6f3ce7db6ca42dfc67;p=git.git 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 --- diff --git a/Makefile b/Makefile index a2b4acaaa..3816ef797 100644 --- a/Makefile +++ b/Makefile @@ -584,15 +584,15 @@ git-status: git-commit gitweb/gitweb.cgi: gitweb/gitweb.perl rm -f $@ $@+ sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \ - -e 's|@@GIT_VERSION@@|$(GIT_VERSION)|g' \ - -e 's|@@GIT_BINDIR@@|$(bindir)|g' \ - -e 's|@@GITWEB_CONFIG@@|$(GITWEB_CONFIG)|g' \ - -e 's|@@GITWEB_SITENAME@@|$(GITWEB_SITENAME)|g' \ - -e 's|@@GITWEB_PROJECTROOT@@|$(GITWEB_PROJECTROOT)|g' \ - -e 's|@@GITWEB_LIST@@|$(GITWEB_LIST)|g' \ - -e 's|@@GITWEB_HOMETEXT@@|$(GITWEB_HOMETEXT)|g' \ - -e 's|@@GITWEB_CSS@@|$(GITWEB_CSS)|g' \ - -e 's|@@GITWEB_LOGO@@|$(GITWEB_LOGO)|g' \ + -e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \ + -e 's|++GIT_BINDIR++|$(bindir)|g' \ + -e 's|++GITWEB_CONFIG++|$(GITWEB_CONFIG)|g' \ + -e 's|++GITWEB_SITENAME++|$(GITWEB_SITENAME)|g' \ + -e 's|++GITWEB_PROJECTROOT++|$(GITWEB_PROJECTROOT)|g' \ + -e 's|++GITWEB_LIST++|$(GITWEB_LIST)|g' \ + -e 's|++GITWEB_HOMETEXT++|$(GITWEB_HOMETEXT)|g' \ + -e 's|++GITWEB_CSS++|$(GITWEB_CSS)|g' \ + -e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \ $< >$@+ chmod +x $@+ mv $@+ $@ diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index b5548ec8f..58eb5b190 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -18,18 +18,18 @@ use File::Find qw(); binmode STDOUT, ':utf8'; our $cgi = new CGI; -our $version = "@@GIT_VERSION@@"; +our $version = "++GIT_VERSION++"; our $my_url = $cgi->url(); our $my_uri = $cgi->url(-absolute => 1); our $rss_link = ""; # core git executable to use # 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 #our $projectroot = "/pub/scm"; -our $projectroot = "@@GITWEB_PROJECTROOT@@"; +our $projectroot = "++GITWEB_PROJECTROOT++"; # location for temporary files needed for diffs 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 # 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 -our $home_text = "@@GITWEB_HOMETEXT@@"; +our $home_text = "++GITWEB_HOMETEXT++"; # URI of default stylesheet -our $stylesheet = "@@GITWEB_CSS@@"; +our $stylesheet = "++GITWEB_CSS++"; # URI of GIT logo -our $logo = "@@GITWEB_LOGO@@"; +our $logo = "++GITWEB_LOGO++"; # 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 our $default_blob_plain_mimetype = 'text/plain'; @@ -60,7 +60,7 @@ our $default_text_plain_charset = undef; # (relative to the current git repository) 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; # version of the core git binary