speed doubled in index_rd.php and flush of command when the table start

[brisk.git] / INSTALL.sh

diff --git a/INSTALL.sh b/INSTALL.sh
index b959272..d31125b 100755 (executable)
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -9,7 +9,7 @@ web_path="$HOME/brisk"
 web_only="FALSE"
 
 if [ -f $HOME/.brisk_install ]; then
-   . $HOME/.brisk_install
+   . $HOME/.spawn_install
 fi
 if [ "x$cookie_path" = "x" ]; then
    cookie_path=$web_path
@@ -17,7 +17,7 @@ fi
 function usage () {
     echo
     echo "$1 -h"
-    echo "$1 [-W] [-n 3|5] [-f conffile] [-p outconf] [-d TRUE|FALSE] [-w web_dir] [-k <ftok_dir>] [-l <legal_path>] [-c <cookie_path>]"
+    echo "$1 [-W] [-n 3|5] [-f conffile] [-p outconf] [-d TRUE|FALSE] [-w web_dir] [-k <ftok_dir>] [-l <legal_path>] [-y <proxy_path>] [-c <cookie_path>]"
     echo "  -h this help"
     echo "  -f use this config file"
     echo "  -p save preferences in the file"
@@ -27,6 +27,7 @@ function usage () {
     echo "  -w dir where place the web tree - def. \"$web_path\""
     echo "  -k dir where place ftok files   - def. \"$ftok_path\""
     echo "  -l dir where save logs          - def. \"$legal_path\""
+    echo "  -y dir where place proxy files  - def. \"$proxy_path\""
     echo "  -c cookie path                  - def. \"$cookie_path\""
     
     echo
@@ -59,7 +60,9 @@ while [ $# -gt 0 ]; do
        -d*) brisk_debug="`get_param "-d" "$1" "$2"`"; sh=$?;;
        -w*) web_path="`get_param "-w" "$1" "$2"`"; sh=$?;;
        -k*) ftok_path="`get_param "-k" "$1" "$2"`"; sh=$?;;
+       -y*) proxy_path="`get_param "-y" "$1" "$2"`"; sh=$?;;
        -c*) cookie_path="`get_param "-c" "$1" "$2"`"; sh=$?;;
+       -l*) legal_path="`get_param "-l" "$1" "$2"`"; sh=$?;;
        -W) web_only="TRUE";;
        -h) usage $0; exit 0;;
        *) usage $0; exit 1;;
@@ -82,7 +85,8 @@ echo "    n_players:   $n_players"
 echo "    brisk_debug:\"$brisk_debug\""
 echo "    web_path:   \"$web_path\""
 echo "    ftok_path:  \"$ftok_path\""
-echo "    legal_path:  \"$legal_path\""
+echo "    legal_path: \"$legal_path\""
+echo "    proxy_path: \"$proxy_path\""
 echo "    cookie_path:\"$cookie_path\""
 echo "    web_only:   \"$web_only\""
 
@@ -95,6 +99,7 @@ if [ ! -z "$outconf" ]; then
     echo "brisk_debug=\"$brisk_debug\""
     echo "web_path=\"$web_path\""
     echo "ftok_path=\"$ftok_path\""
+    echo "proxy_path=\"$proxy_path\""
     echo "legal_path=\"$legal_path\""
     echo "cookie_path=\"$cookie_path\""
     echo "web_only=\"$web_only\""
@@ -122,11 +127,22 @@ if [ "$web_only" = "FALSE" ]; then
     # create the fs subtree to enable ftok-ing
     touch ${ftok_path}/main
     chmod 666 ${ftok_path}/main
+    for i in `seq 0 99`; do 
+        touch ${ftok_path}/table$i
+        chmod 666 ${ftok_path}/table$i
+    done
 fi
-install -d $web_path
-install -m 644 web/*.{php,phh,css,js,mp3,swf} ${web_path}
+install -d ${web_path}__
+for i in `find web -type d | grep -v /CVS | sed 's/^....//g'`; do
+    install -d ${web_path}__/$i 
+done
+
+for i in `find web -name '*.php' -o -name '*.phh' -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
+done
+
 cd web
-find . -name '.htaccess' -exec install -m 644 {} ${web_path}/{} \;
+find . -name '.htaccess' -exec install -m 644 {} ${web_path}__/{} \;
 cd -
 
 if [ $n_players -eq 5 ]; then
@@ -136,19 +152,39 @@ else
 fi
 
 # .js substitutions
-sed -i "s/PLAYERS_N *= *[0-9]\+/PLAYERS_N = $n_players/g" `find ${web_path} -type f -name '*.js' -exec grep -l 'PLAYERS_N *= *[0-9]\+' {} \;`
+sed -i "s/PLAYERS_N *= *[0-9]\+/PLAYERS_N = $n_players/g" `find ${web_path}__ -type f -name '*.js' -exec grep -l 'PLAYERS_N *= *[0-9]\+' {} \;`
 
-sed -i "s/^var G_send_time *= *[0-9]\+/var G_send_time = $send_time/g" `find ${web_path} -type f -name '*.js' -exec grep -l '^var G_send_time *= *[0-9]\+' {} \;`
+sed -i "s/^var G_send_time *= *[0-9]\+/var G_send_time = $send_time/g" `find ${web_path}__ -type f -name '*.js' -exec grep -l '^var G_send_time *= *[0-9]\+' {} \;`
 
 # .ph[ph] substitutions
-sed -i "s/define *( *PLAYERS_N, *[0-9]\+ *)/define(PLAYERS_N, $n_players)/g" `find ${web_path} -type f -name '*.ph*' -exec grep -l 'define *( *PLAYERS_N, *[0-9]\+ *)' {} \;`
+sed -i "s/define *( *PLAYERS_N, *[0-9]\+ *)/define(PLAYERS_N, $n_players)/g" `find ${web_path}__ -type f -name '*.ph*' -exec grep -l 'define *( *PLAYERS_N, *[0-9]\+ *)' {} \;`
+
+sed -i "s/define *( *BRISKIN5_PLAYERS_N, *[0-9]\+ *)/define(BRISKIN5_PLAYERS_N, $n_players)/g" `find ${web_path}__ -type f -name '*.ph*' -exec grep -l 'define *( *BRISKIN5_PLAYERS_N, *[0-9]\+ *)' {} \;`
+
+sed -i "s@define *( *FTOK_PATH,[^)]*)@define(FTOK_PATH, \"$ftok_path\")@g" `find ${web_path}__ -type f -name '*.ph*' -exec grep -l 'define *( *FTOK_PATH,[^)]*)' {} \;`
 
-sed -i "s@define *( *FTOK_PATH,[^)]*)@define(FTOK_PATH, \"$ftok_path\")@g" `find ${web_path} -type f -name '*.ph*' -exec grep -l 'define *( *FTOK_PATH,[^)]*)' {} \;`
+sed -i "s@define *( *BRISK_DEBUG,[^)]*)@define(BRISK_DEBUG, $brisk_debug)@g" ${web_path}__/Obj/brisk.phh
 
-sed -i "s@define *( *BRISK_DEBUG,[^)]*)@define(BRISK_DEBUG, $brisk_debug)@g" ${web_path}/brisk.phh
+sed -i "s@define *( *LEGAL_PATH,[^)]*)@define(LEGAL_PATH, \"$legal_path\")@g" ${web_path}__/Obj/brisk.phh
 
-sed -i "s@define *( *LEGAL_PATH,[^)]*)@define(LEGAL_PATH, $legal_path)@g" ${web_path}/brisk.phh
+sed -i "s@define *( *PROXY_PATH,[^)]*)@define(PROXY_PATH, \"$proxy_path\")@g" ${web_path}__/Obj/brisk.phh
 
-sed -i "s@var \+xhr_rd_cookiepath \+= \+\"[^\"]*\";@var xhr_rd_cookiepath = \"$cookie_path\";@g" ${web_path}/xhr.js
+sed -i "s@var \+xhr_rd_cookiepath \+= \+\"[^\"]*\";@var xhr_rd_cookiepath = \"$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
+    mv ${web_path} ${web_path}.old
+fi
+
+if [ -d ../brisk-img ]; then
+    cd ../brisk-img
+    ./INSTALL.sh -w ${web_path}__
+    cd -
+fi
+
+mv ${web_path}__ ${web_path}
+if [ -d ${web_path}.old ]; then
+    rm -rf ${web_path}.old
+fi
 
 exit 0