reduced log

[brisk.git] / INSTALL.sh

diff --git a/INSTALL.sh b/INSTALL.sh
index 219c73e..81be3e5 100755 (executable)
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -85,7 +85,7 @@ function searchetc() {
         fi
         pp="$(dirname "$pp")"
     done
-    
+
     return 1
 }
 
@@ -185,7 +185,7 @@ while [ $# -gt 0 ]; do
         -l*) legal_path="$(get_param "-l" "$1" "$2")"; sh=$?;;
         -U*) usock_path="$(get_param "-U" "$1" "$2")"; sh=$?;;
         -u*) sys_user="$(get_param "-u" "$1" "$2")"; sh=$?;;
-        system) action=system;;
+        system) action=system ; sh=1;;
         -W) web_only="TRUE";;
         -x) test_add="TRUE";;
         -h) usage $0; exit 0;;
@@ -227,7 +227,7 @@ echo "    web_only:   \"$web_only\""
 echo "    test_add:   \"$test_add\""
 
 if [ ! -z "$outconf" ]; then
-  ( 
+  (
     echo "#"
     echo "#  Produced automatically by brisk::INSTALL.sh"
     echo "#"
@@ -324,7 +324,7 @@ if [ "$web_only" = "FALSE" ]; then
        exit 3
     fi
     rm $ftokk_path/spy.txt
-    
+
     # create the fs subtree to enable ftok-ing
     touch ${ftokk_path}/main
     chmod 666 ${ftokk_path}/main
@@ -369,7 +369,7 @@ if [ "$web_only" = "FALSE" ]; then
 fi
 install -d ${web_path}__
 for i in $(find web -type d | grep '/' | sed 's/^....//g'); do
-    install -d ${web_path}__/$i 
+    install -d ${web_path}__/$i
 done
 
 for i in $(find web -name '.htaccess' -o -name '*.php' -o -name '*.phh' -o -name '*.pho' -o -name '*.css' -o -name '*.js' -o -name '*.mp3' -o -name '*.swf' -o -name 'terms-of-service*' | sed 's/^....//g'); do
@@ -431,7 +431,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 }')"
-sed -i "s@^\(\$DOCUMENT_ROOT *= *[\"']\)[^\"']*\([\"']\)@\1$document_root\2@g" ${web_path}__/spush/*.ph*
+sed -i "s@^\(\$DOCUMENT_ROOT *= *[\"']\)[^\"']*\([\"']\)@\1$document_root\2@g" ${web_path}__/spush/*.ph* ${web_path}__/donometer.php
 
 if [ -d ../brisk-img ]; then
     cd ../brisk-img