From: Mike Dalessio <mike@csa.net>
Date: Sat, 6 Oct 2007 17:29:48 +0000 (-0400)
Subject: instaweb: allow for use of auto-generated scripts
X-Git-Tag: v1.5.4-rc0~372
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=14b45b66e7f75341040c9797af60fb9318c8b047;p=git.git

instaweb: allow for use of auto-generated scripts

this patch allows scripts that reside in $fqgitdir/gitweb to be used
for firing up an instaweb server. this lays the groundwork for
extending instaweb support to non-standard web servers, which may
require a script for proper invocation.

Signed-off-by: Mike Dalessio <mike@csa.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-instaweb.sh b/git-instaweb.sh
index f5629e743..8eb7f3ed1 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -37,7 +37,9 @@ start_httpd () {
 	else
 		# many httpds are installed in /usr/sbin or /usr/local/sbin
 		# these days and those are not in most users $PATHs
-		for i in /usr/local/sbin /usr/sbin
+		# in addition, we may have generated a server script
+		# in $fqgitdir/gitweb.
+		for i in /usr/local/sbin /usr/sbin "$fqgitdir/gitweb"
 		do
 			if test -x "$i/$httpd_only"
 			then