[PATCH 2/4] git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf

From

Jakub Narebski <jnareb@gmail.com>

Date

Jun 23, 2011, 19:56 UTC

Message-ID

<20110623195516.18265.825.stgit@localhost.localdomain>

In-Reply-To

<20110623194624.18265.82482.stgit@localhost.localdomain>

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