X-Git-Url: https://mop.ddnsfree.com/gitweb/?p=brisk.git;a=blobdiff_plain;f=INSTALL.sh;h=5391caef163fe1d87b013130e6e47a1e651baf48;hp=a4b076c5b840a4717b8fbd80e55997f12855dac2;hb=47ae15c35f3c407208e52329949039a55e1f3693;hpb=1ac0c5959126e874cc99f080265d560534162e70

diff --git a/INSTALL.sh b/INSTALL.sh
index a4b076c..5391cae 100755
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -9,7 +9,8 @@ apache_conf="/etc/apache2/sites-available/default"
 card_hand=3
 players_n=3
 tables_n=44
-tables_auth_n=12
+tables_appr_n=12
+tables_auth_n=8
 tables_cert_n=4
 brisk_auth_conf="brisk_spu_auth.conf.pho"
 brisk_debug="0x0400"
@@ -31,7 +32,7 @@ function usage () {
     echo "$1 -h"
     echo "$1 chk                          - run lintian on all ph* files."
     echo "$1 pkg                          - build brisk packages."
-    echo "$1 [-W] [-n 3|5] [-c 2|8] [-t <(n>=4)>] [-T <auth_tab>] [-G <cert_tab>] [-A <apache-conf>] [-a <auth_file_name>] [-f <conffile>] [-p <outconf>] [-U <usock_path>] [-u <sys_user>] [-d <TRUE|FALSE>] [-w <web_dir>] [-k <ftok_dir>] [-l <legal_path>] [-y <proxy_path>] [-P <prefix_path>] [-x]"
+    echo "$1 [-W] [-n 3|5] [-c 2|8] [-t <(n>=4)>] [-T <auth_tab>] [-r <appr_tab>] [-G <cert_tab>] [-A <apache-conf>] [-a <auth_file_name>] [-f <conffile>] [-p <outconf>] [-U <usock_path>] [-u <sys_user>] [-d <TRUE|FALSE>] [-w <web_dir>] [-k <ftok_dir>] [-l <legal_path>] [-y <proxy_path>] [-P <prefix_path>] [-x]"
     echo "  -h this help"
     echo "  -f use this config file"
     echo "  -p save preferences in the file"
@@ -40,6 +41,7 @@ function usage () {
     echo "  -c number cards in hand         - def. $card_hand"
     echo "  -n number of players            - def. $players_n"
     echo "  -t number of tables             - def. $tables_n"
+    echo "  -r number of appr-only tables   - def. $tables_appr_n"
     echo "  -T number of auth-only tables   - def. $tables_auth_n"
     echo "  -G number of cert-only tables   - def. $tables_cert_n"
     echo "  -a authorization file name      - def. \"$brisk_auth_conf\""
@@ -83,7 +85,7 @@ function searchetc() {
         fi
         pp="$(dirname "$pp")"
     done
-    
+
     return 1
 }
 
@@ -170,6 +172,7 @@ while [ $# -gt 0 ]; do
         -c*) card_hand="$(get_param "-c" "$1" "$2")"; sh=$?;;
         -n*) players_n="$(get_param "-n" "$1" "$2")"; sh=$?;;
         -t*) tables_n="$(get_param "-t" "$1" "$2")"; sh=$?;;
+        -r*) tables_appr_n="$(get_param "-r" "$1" "$2")"; sh=$?;;
         -T*) tables_auth_n="$(get_param "-T" "$1" "$2")"; sh=$?;;
         -G*) tables_cert_n="$(get_param "-G" "$1" "$2")"; sh=$?;;
         -a*) brisk_auth_conf="$(get_param "-a" "$1" "$2")"; sh=$?;;
@@ -207,6 +210,7 @@ echo "    apache_conf:\"$apache_conf\""
 echo "    card_hand:   $card_hand"
 echo "    players_n:   $players_n"
 echo "    tables_n:    $tables_n"
+echo "    tables_appr_n: $tables_appr_n"
 echo "    tables_auth_n: $tables_auth_n"
 echo "    tables_cert_n: $tables_cert_n"
 echo "    brisk_auth_conf: \"$brisk_auth_conf\""
@@ -223,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 "#"
@@ -231,6 +235,7 @@ if [ ! -z "$outconf" ]; then
     echo "card_hand=$card_hand"
     echo "players_n=$players_n"
     echo "tables_n=$tables_n"
+    echo "tables_appr_n=$tables_appr_n"
     echo "tables_auth_n=$tables_auth_n"
     echo "tables_cert_n=$tables_cert_n"
     echo "brisk_auth_conf=\"$brisk_auth_conf\""
@@ -319,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
@@ -364,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
@@ -411,6 +416,7 @@ s@define *( *'SITE_PREFIX_LEN',[^)]*)@define('SITE_PREFIX_LEN', $prefix_path_len
 sed -i "s@define *( *'USOCK_PATH',[^)]*)@define('USOCK_PATH', \"$usock_path\")@g" ${web_path}__/spush/brisk-spush.phh
 
 sed -i "s@define *( *'TABLES_N',[^)]*)@define('TABLES_N', $tables_n)@g;
+s@define *( *'TABLES_APPR_N',[^)]*)@define('TABLES_APPR_N', $tables_appr_n)@g;
 s@define *( *'TABLES_AUTH_N',[^)]*)@define('TABLES_AUTH_N', $tables_auth_n)@g;
 s@define *( *'TABLES_CERT_N',[^)]*)@define('TABLES_CERT_N', $tables_cert_n)@g;
 s@define *( *'BRISK_DEBUG',[^)]*)@define('BRISK_DEBUG', $brisk_debug)@g;
@@ -425,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