Git development
 help / color / mirror / Atom feed
From: Matthias Lederhofer <matled@gmx.net>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: [PATCH] gitweb: use single quotes for values replaced by the Makefile
Date: Wed, 2 Aug 2006 22:17:20 +0200	[thread overview]
Message-ID: <E1G8N9c-0004GK-Gz@moooo.ath.cx> (raw)
In-Reply-To: <20060802192333.GA30861@coredump.intra.peff.net>

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
---
This patch is on top of the last one.
> Now I noticed a problem: do not use the @@FOO@@ in double quotes
> because perl will spit a lot of warnings like "Possible unintended
> interpolation of @GIT_VERSION in string" Either we should use
> another delimiter or use single quotes (this is the way it is done
> in git-send-email.perl and git-svn.perl).  I don't know how likely
> it is that characters that are interpreted different in double
> quotes are in filenames but I'd prefer single quotes just to be on
> the safe site.  This disallows using '/etc/foo/$ENV{SITE_NAME}' as
> config file but one can just use '/etc/foo/bar' which requires
> '/etc/foo/$ENV{SITE_NAME}'.
---
 gitweb/gitweb.perl |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index d5b2de8..f4c0d87 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 @@ # file to use for guessing MIME types be
 # (relative to the current git repository)
 our $mimetypes_file = undef;
 
-our $GITWEB_CONFIG = "@@GITWEB_CONFIG@@";
+our $GITWEB_CONFIG = '@@GITWEB_CONFIG@@';
 require $GITWEB_CONFIG if -e $GITWEB_CONFIG;
 
 # version of the core git binary
-- 
1.4.2.rc2.g4713

  reply	other threads:[~2006-08-02 20:17 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-08-02 19:23 [PATCH] gitweb: optionally read config from GITWEB_CONFIG Jeff King
2006-08-02 20:17 ` Matthias Lederhofer [this message]
2006-08-02 20:50   ` [PATCH] gitweb: use single quotes for values replaced by the Makefile Junio C Hamano
2006-08-02 20:57     ` Matthias Lederhofer
2006-08-02 20:58     ` Jeff King
2006-08-02 20:21 ` [PATCH] gitweb: optionally read config from GITWEB_CONFIG Jakub Narebski
2006-08-02 20:31   ` Matthias Lederhofer
2006-08-02 20:36     ` Jakub Narebski
2006-08-02 20:41   ` Jeff King
2006-08-02 20:28 ` Junio C Hamano
2006-08-02 20:29 ` [PATCH] gitweb: require $ENV{'GITWEB_CONFIG'} Matthias Lederhofer
2006-08-02 20:50   ` Jeff King
2006-08-02 20:58     ` Junio C Hamano
2006-08-02 20:59       ` Jeff King
2006-08-02 20:51 ` [PATCH] gitweb: optionally read config from GITWEB_CONFIG Luben Tuikov
2006-08-02 20:56   ` Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1G8N9c-0004GK-Gz@moooo.ath.cx \
    --to=matled@gmx.net \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox