From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Wed, 8 May 2013 05:44:34 +0000 (+0200)
Subject: more flexible document_root retriver
X-Git-Tag: v4.9.0~11
X-Git-Url: https://mop.ddnsfree.com/gitweb/?p=brisk.git;a=commitdiff_plain;h=3130c80cb5f4f2ffb973818c6a0492b200577d5d

more flexible document_root retriver
---

diff --git a/INSTALL.sh b/INSTALL.sh
index 257d867..b021de5 100755
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -x
+# set -x
 #
 # Defaults
 #
@@ -367,7 +367,7 @@ sed -i "s@var \+cookiepath \+= \+\"[^\"]*\";@var cookiepath = \"$prefix_path\";@
 
 sed -i "s@\( \+cookiepath *: *\)\"[^\"]*\" *,@\1 \"$prefix_path\",@g" ${web_path}__/xynt-streaming.js
 
-document_root="$(grep DocumentRoot "${apache_conf}"  | grep -v '^#' | awk '{ print $2 }')"
+document_root="$(grep DocumentRoot "${apache_conf}"  | grep -v '^[ 	]*#' | awk '{ print $2 }')"
 sed -i "s@^\(\$DOCUMENT_ROOT *= *[\"']\)[^\"']*\([\"']\)@\1$document_root\2@g" ${web_path}__/spush/*.ph*
 
 if [ -d ${web_path} ]; then