Re: [PATCH v2] instaweb: make it compatible with Mac OS X 10.5's apache installation.
- From
nathan spindel <nathans@gmail.com>
- Date
- May 11, 2008, 19:41 UTC
- Message-ID
- <B3990C52-0AF9-490C-86E1-B311144C6661@gmail.com>
- In-Reply-To
- <1210534569-48466-1-git-send-email-nathans@gmail.com>
On May 11, 2008, at 12:36 PM, nathan spindel wrote:
Show 43 quoted lines
> apache2_conf () {
> - test -z "$module_path" && module_path=/usr/lib/apache2/modules
> + # if there isn't an apache2 command on the system but there
> + # is a httpd command which looks like apache, use that instead
> + # for Mac OS X compatibility.
> + httpd_only="`echo $httpd | cut -f1 -d' '`"
> + if ! type $httpd_only > /dev/null 2>&1
> + then
> + found_apache_command=1
> + httpd_parent_paths="/usr/local/sbin /usr/sbin"
> + for i in $httpd_parent_paths; do
> + if test -x "$i/$httpd_only"
> + then
> + found_apache_command=0
> + break
> + fi
> + done
> +
> + if test $found_apache_command != 0
> + then
> + alt_apache="httpd"
> + if type $alt_apache > /dev/null 2>&1
> + then
> + $alt_apache -v | grep Apache > /dev/null 2>&1
> + if test $? == 0
> + then
> + httpd=`echo "$httpd" | sed "s/apache2/httpd/"`
> + else
> + for i in $httpd_parent_paths; do
> + if test -x "$i/$alt_apache"
> + then
> + $i/$alt_apache -v | grep Apache > /dev/null 2>&1
> + if test $? == 0
> + then
> + httpd=`echo "$httpd" | sed "s/apache2/httpd/"`
> + break
> + fi
> + fi
> + done
> + fi
> + fi
> + fi
> + fiI'd like to see a cleaner implementation of this logic, if anyone has strong shell-fu.