]> git.ipfire.org Git - thirdparty/git.git/commitdiff
git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf
authorJakub Narebski <jnareb@gmail.com>
Thu, 23 Jun 2011 19:56:37 +0000 (21:56 +0200)
committerEric Wong <normalperson@yhbt.net>
Mon, 27 Jun 2011 09:11:41 +0000 (09:11 +0000)
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>
git-instaweb.sh

index 49bab7bc974f5feceb1e0806ce8d442fb14ac8fd..2be22a0dfe943918d91a4a557fde0f27790a815f 100755 (executable)
@@ -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