milestone 1 to move to an http_streaming object

[brisk.git] / INSTALL.sh

diff --git a/INSTALL.sh b/INSTALL.sh
index 6437212..134d2fb 100755 (executable)
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -3,20 +3,20 @@
 #
 # Defaults
 #
-CONFIG_FILE="$HOME/.brosk_install"
+CONFIG_FILE="$HOME/.brisk_install"
 
 players_n=3
 tables_n=44
 tables_auth_n=12
-brisk_auth_conf="brosk_auth.conf.pho"
+brisk_auth_conf="brisk_auth.conf.pho"
 brisk_debug="0x0400"
 # brisk_debug="0xffff"
-web_path="/home/nastasi/web/brosk"
-ftok_path="/home/nastasi/brisk-priv/ftok/brosk"
-proxy_path="/home/nastasi/brisk-priv/proxy/brosk"
-legal_path="/home/nastasi/brisk-priv/brosk"
-cookie_path="/brosk/"
-brisk_conf="brosk.conf.pho"
+web_path="/home/nastasi/web/brisk"
+ftok_path="/home/nastasi/brisk-priv/ftok/brisk"
+proxy_path="/home/nastasi/brisk-priv/proxy/brisk"
+legal_path="/home/nastasi/brisk-priv/brisk"
+cookie_path="/brisk/"
+brisk_conf="brisk.conf.pho"
 web_only="FALSE"
 
 
@@ -201,6 +201,8 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
+IFS='
+'
 #
 #  Installation
 #
@@ -271,18 +273,14 @@ if [ "$web_only" = "FALSE" ]; then
 
 fi
 install -d ${web_path}__
-for i in $(find web -type d | grep -v /CVS | sed 's/^....//g'); do
+for i in $(find web -type d | sed 's/^....//g'); do
     install -d ${web_path}__/$i 
 done
 
-for i in $(find web -name '*.php' -o -name '*.phh' -o -name '*.pho' -o -name '*.css' -o -name '*.js' -o -name '*.mp3' -o -name '*.swf' | grep -v /CVS | sed 's/^....//g'); do
-    install -m 644 web/$i ${web_path}__/$i
+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' | sed 's/^....//g'); do
+    install -m 644 "web/$i" "${web_path}__/$i"
 done
 
-cd web
-find . -name '.htaccess' -exec install -m 644 {} ${web_path}__/{} \;
-cd - >/dev/null 2>&1
-
 if [ $players_n -eq 5 ]; then
    send_time=250
 else
@@ -315,7 +313,7 @@ sed -i "s@define *( *BRISK_CONF,[^)]*)@define(BRISK_CONF, \"$brisk_conf\")@g" ${
 
 sed -i "s@define *( *BRISK_AUTH_CONF,[^)]*)@define(BRISK_AUTH_CONF, \"$brisk_auth_conf\")@g" ${web_path}__/Obj/auth.phh
 
-sed -i "s@var \+xhr_rd_cookiepath \+= \+\"[^\"]*\";@var xhr_rd_cookiepath = \"$cookie_path\";@g" ${web_path}__/xhr.js
+sed -i "s@\( \+xhr_rd_cookiepath *: *\)\"[^\"]*\" *,@\1 \"$cookie_path\",@g" ${web_path}__/xhr.js
 sed -i "s@var \+cookiepath \+= \+\"[^\"]*\";@var cookiepath = \"$cookie_path\";@g" ${web_path}__/commons.js
 
 if [ -d ${web_path} ]; then