From: Jakub Narebski <jnareb@gmail.com>
Date: Thu, 23 Jun 2011 19:56:37 +0000 (+0200)
Subject: git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf
X-Git-Tag: v1.7.7-rc0~127^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48bf76ca93c7569660712c12b3c4f86c60803352;p=thirdparty%2Fgit.git

git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf

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

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/git-instaweb.sh b/git-instaweb.sh
index 49bab7bc97..2be22a0dfe 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