git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Cc: Gurjeet Singh <singh.gurjeet@gmail.com>,
	Eric Wong <normalperson@yhbt.net>
Subject: [PATCH 2/4] git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf
Date: Thu, 23 Jun 2011 21:56:37 +0200	[thread overview]
Message-ID: <20110623195516.18265.825.stgit@localhost.localdomain> (raw)
In-Reply-To: <20110623194624.18265.82482.stgit@localhost.localdomain>

Don't repeat yourself: use "$conf" instead of its [current] contents,
namely "$fqgitdir/gitweb/httpd.conf".

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
Straighforward improvement.  Note that currently $conf is constant,
and doesn't change its value.

 git-instaweb.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-instaweb.sh b/git-instaweb.sh
index 49bab7b..2be22a0 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -103,7 +103,7 @@ start_httpd () {
 	case "$httpd" in
 	*mongoose*|*plackup*)
 		#These servers don't have a daemon mode so we'll have to fork it
-		$full_httpd "$fqgitdir/gitweb/httpd.conf" &
+		$full_httpd "$conf" &
 		#Save the pid before doing anything else (we'll print it later)
 		pid=$!
 
@@ -117,7 +117,7 @@ $pid
 EOF
 		;;
 	*)
-		$full_httpd "$fqgitdir/gitweb/httpd.conf"
+		$full_httpd "$conf"
 		if test $? != 0; then
 			echo "Could not execute http daemon $httpd."
 			exit 1

  parent reply	other threads:[~2011-06-23 19:57 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-23  1:06 Having some problem with instaweb Gurjeet Singh
2011-06-23  8:23 ` Jakub Narebski
2011-06-23 11:48   ` Gurjeet Singh
2011-06-23 19:29     ` Jakub Narebski
2011-06-23 19:50       ` [PATCH 0/4] git-instaweb: Improving handling of --start/--restart Jakub Narebski
2011-06-23 19:55         ` [PATCH 1/4] git-instaweb: Extract configuring web server into configure_httpd Jakub Narebski
2011-06-23 19:56         ` Jakub Narebski [this message]
2011-06-23 20:59         ` [PATCH 3/4] git-instaweb: Move all actions at the end of script Jakub Narebski
2011-06-23 21:01         ` [PATCH 4/4] git-instaweb: Check that correct config file exists for (re)start Jakub Narebski
2011-06-28  3:22         ` [PATCH 0/4] git-instaweb: Improving handling of --start/--restart Eric Wong

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=20110623195516.18265.825.stgit@localhost.localdomain \
    --to=jnareb@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=normalperson@yhbt.net \
    --cc=singh.gurjeet@gmail.com \
    /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;
as well as URLs for NNTP newsgroup(s).