From: Junio C Hamano Date: Fri, 21 Mar 2008 07:04:27 GMT Subject: Re: [PATCH resend 1/2] Make git-svn tests behave better on OS X Message-ID: <7vod98r210.fsf@gitster.siamese.dyndns.org> In-Reply-To: <20080321065824.GB28144@muzzle> Eric Wong writes: > Kevin Ballard wrote: > ... > I seem to recall seeing a RHEL or CentOS machine using /usr/sbin/httpd, > somewhere, too. Any non-Debian users care to comment/add more paths? > ... >> -SVN_HTTPD_MODULE_PATH=${SVN_HTTPD_MODULE_PATH-'/usr/lib/apache2/modules'} >> -SVN_HTTPD_PATH=${SVN_HTTPD_PATH-'/usr/sbin/apache2'} >> +if test `uname -s` = Darwin >> +then >> + SVN_HTTPD_MODULE_PATH=${SVN_HTTPD_MODULE_PATH-'/usr/libexec/apache2'} >> + SVN_HTTPD_PATH=${SVN_HTTPD_PATH-'/usr/sbin/httpd'} >> +else >> + SVN_HTTPD_MODULE_PATH=${SVN_HTTPD_MODULE_PATH-'/usr/lib/apache2/modules'} >> + SVN_HTTPD_PATH=${SVN_HTTPD_PATH-'/usr/sbin/apache2'} >> +fi I really hate this patch. Why do we even _care_ about uname? Wouldn't something like this be a lot easier to maintain in the longer run? 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