X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=INSTALL.sh;h=175893e1914f034c7aae9cc841ce7f0c3105caa9;hb=refs%2Fheads%2Fmeet-appr;hp=ee329b006807991b343f9fb04982db2e40dcef6b;hpb=28fa285b05832a5c3521870482d3c29dfc71f4ac;p=brisk.git

diff --git a/INSTALL.sh b/INSTALL.sh
index ee329b0..175893e 100755
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 # set -x
+set -e
 #
 # Defaults
 #
@@ -9,7 +10,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 +33,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 +42,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\""
@@ -90,7 +93,7 @@ function searchetc() {
 #
 #  MAIN
 #
-declare -a nam
+declare -a nam nam_gz
 if [ "$1" = "chk" ]; then
     set -e
     oldifs="$IFS"
@@ -118,35 +121,32 @@ if [ "$1" = "pkg" ]; then
     else
         tag="$(git describe)"
     fi
-    nam_idx=0
-    nam[$nam_idx]="brisk_${tag}.tgz"
-    nam_idx=$((nam_idx + 1))
-    nam[$nam_idx]="brisk-img_${tag}.tgz"
+    nam=("brisk" "brisk-img" "fieldify")
+    nam_idx=3
 
     if [ -d ../curl-de-sac ]; then
+       nam[$nam_idx]="curl-de-sac"
        nam_idx=$((nam_idx + 1))
-       nam[$nam_idx]="curl-de-sac_${tag}.tgz"
     fi
     pkg_list=""
     sep=""
-    for i in ${nam[@]}; do
-        pkg_list="${pkg_list}${sep}${i}"
+    for i in $( seq 0 $((${#nam[@]} - 1)) ); do
+        echo "$i"
+        nam_gz[$i]="${nam[$i]}_${tag}.tgz"
+        pkg_list="${pkg_list}${sep}${nam_gz[$i]}"
         sep=", "
     done
-    echo "Build packages ${pkg_list}."
+
+    echo "Build packages ${pkg_list} ."
     read -p "Proceed [y/n]: " a
     if [ "$a" != "y" -a  "$a" != "Y" ]; then
         exit 1
     fi
-    git archive --format=tar --prefix=brisk-${tag}/brisk/ $tag | gzip > ../$nam1
-    cd ../brisk-img
-    git archive --format=tar --prefix=brisk-${tag}/brisk-img/ $tag | gzip > ../$nam2
-    cd -
-    if [ -d ../curl-de-sac ]; then
-        cd ../curl-de-sac
-        git archive --format=tar --prefix=brisk-${tag}/curl-de-sac/ $tag | gzip > ../$nam3
+    for i in $( seq 0 $((${#nam[@]} - 1)) ); do
+        cd "../${nam[$i]}"
+        git archive --format=tar --prefix=brisk-${tag}/${nam[$i]}/ $tag | gzip > ../${nam_gz[$i]}
         cd -
-    fi
+    done
     exit 0
 fi
 
@@ -170,6 +170,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 +208,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\""
@@ -231,6 +233,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\""
@@ -405,6 +408,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;
@@ -421,6 +425,12 @@ sed -i "s@\( \+cookiepath *: *\)\"[^\"]*\" *,@\1 \"$prefix_path\",@g" ${web_path
 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 ../fieldify ]; then
+    pw="$PWD"
+    cd ../fieldify
+    ./INSTALL.sh -s "$pw" -w ${web_path}__
+    cd - >/dev/null 2>&1
+fi
 if [ -d ../brisk-img ]; then
     cd ../brisk-img
     ./INSTALL.sh -w ${web_path}__