lib-git-svn.sh: Avoid setting web server variables unnecessarily
If the SVN_HTTPD_PORT variable is not set, then we will not even attempt to start a web server in the start_httpd function (despite it's name), so there is no need to determine values for the SVN_HTTPD_PATH and SVN_HTTPD_MODULE_PATH variables. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
531dd7bbf4
commit
b6fe97483f
@ -68,28 +68,31 @@ svn_cmd () {
|
||||
svn "$orig_svncmd" --config-dir "$svnconf" "$@"
|
||||
}
|
||||
|
||||
for d in \
|
||||
"$SVN_HTTPD_PATH" \
|
||||
/usr/sbin/apache2 \
|
||||
/usr/sbin/httpd \
|
||||
; do
|
||||
if test -f "$d"
|
||||
then
|
||||
SVN_HTTPD_PATH="$d"
|
||||
break
|
||||
fi
|
||||
done
|
||||
for d in \
|
||||
"$SVN_HTTPD_MODULE_PATH" \
|
||||
/usr/lib/apache2/modules \
|
||||
/usr/libexec/apache2 \
|
||||
; do
|
||||
if test -d "$d"
|
||||
then
|
||||
SVN_HTTPD_MODULE_PATH="$d"
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -n "$SVN_HTTPD_PORT"
|
||||
then
|
||||
for d in \
|
||||
"$SVN_HTTPD_PATH" \
|
||||
/usr/sbin/apache2 \
|
||||
/usr/sbin/httpd \
|
||||
; do
|
||||
if test -f "$d"
|
||||
then
|
||||
SVN_HTTPD_PATH="$d"
|
||||
break
|
||||
fi
|
||||
done
|
||||
for d in \
|
||||
"$SVN_HTTPD_MODULE_PATH" \
|
||||
/usr/lib/apache2/modules \
|
||||
/usr/libexec/apache2 \
|
||||
; do
|
||||
if test -d "$d"
|
||||
then
|
||||
SVN_HTTPD_MODULE_PATH="$d"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
start_httpd () {
|
||||
repo_base_path="$1"
|
||||
|
Loading…
Reference in New Issue
Block a user