aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Dalessio <mike@csa.net>2007-10-06 13:29:48 -0400
committerShawn O. Pearce <spearce@spearce.org>2007-10-15 21:36:19 -0400
commit14b45b66e7f75341040c9797af60fb9318c8b047 (patch)
treef78421ba6421a94186c298b991b5c5102db58366
parenta9834f58335b81f48e137beb33afb5bb799cdae8 (diff)
downloadgit-14b45b66e7f75341040c9797af60fb9318c8b047.tar.gz
git-14b45b66e7f75341040c9797af60fb9318c8b047.tar.xz
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>
-rwxr-xr-xgit-instaweb.sh4
1 files changed, 3 insertions, 1 deletions
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