X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=INSTALL.sh;h=58656614bd1260d375c068a5e0aac5be8a696863;hb=da3a5c4394ca298a68e367859ef226e6bcc3b873;hp=b021de51cdb43a62d41165f13066fe7d11eb05c7;hpb=3130c80cb5f4f2ffb973818c6a0492b200577d5d;p=brisk.git diff --git a/INSTALL.sh b/INSTALL.sh index b021de5..5865661 100755 --- a/INSTALL.sh +++ b/INSTALL.sh @@ -6,6 +6,7 @@ CONFIG_FILE="$HOME/.brisk_install" apache_conf="/etc/apache2/sites-available/default" +card_hand=3 players_n=3 tables_n=44 tables_auth_n=12 @@ -21,7 +22,7 @@ legal_path="/home/nastasi/brisk-priv/brisk" prefix_path="/brisk/" brisk_conf="brisk_spu.conf.pho" web_only="FALSE" - +test_add="FALSE" # # functions function usage () { @@ -29,12 +30,13 @@ 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] [-t <(n>=4)>] [-T ] [-A ] [-a ] [-f ] [-p ] [-U ] [-u ] [-d ] [-w ] [-k ] [-l ] [-y ] [-P ]" + echo "$1 [-W] [-n 3|5] [-c 3|8] [-t <(n>=4)>] [-T ] [-A ] [-a ] [-f ] [-p ] [-U ] [-u ] [-d ] [-w ] [-k ] [-l ] [-y ] [-P ] [-x]" echo " -h this help" echo " -f use this config file" echo " -p save preferences in the file" echo " -W web files only" echo " -A apache_conf - def. $apache_conf" + 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 " -T number of auth-only tables - def. $tables_auth_n" @@ -48,6 +50,7 @@ function usage () { echo " -C config filename - def. \"$brisk_conf\"" echo " -U unix socket path - def. \"$usock_path\"" echo " -u system user to run brisk dae - def. \"$sys_user\"" + echo " -x copy tests as normal php - def. \"$test_add\"" echo } @@ -93,6 +96,14 @@ if [ "$1" = "chk" ]; then for i in $(find -name '*.pho' -o -name '*.phh' -o -name '*.php'); do php5 -l $i done + + taggit="$(git describe --tags | sed 's/^v//g')" + tagphp="$(grep "^\$G_brisk_version = " web/Obj/brisk.phh | sed 's/^[^"]\+"//g;s/".*//g')" + if [ "$taggit" != "$tagphp" ]; then + echo + echo "WARNING: taggit: [$taggit] tagphp: [$tagphp]" + echo + fi exit 0 fi @@ -135,6 +146,7 @@ while [ $# -gt 0 ]; do -A*) apache_conf="$(get_param "-A" "$1" "$2")"; sh=$?;; -f*) conffile="$(get_param "-f" "$1" "$2")"; sh=$?;; -p*) outconf="$(get_param "-p" "$1" "$2")"; sh=$?;; + -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=$?;; -T*) tables_auth_n="$(get_param "-T" "$1" "$2")"; sh=$?;; @@ -150,6 +162,7 @@ while [ $# -gt 0 ]; do -u*) sys_user="$(get_param "-u" "$1" "$2")"; sh=$?;; system) action=system;; -W) web_only="TRUE";; + -x) test_add="TRUE";; -h) usage $0; exit 0;; *) usage $0; exit 1;; esac @@ -168,8 +181,9 @@ done # echo " outconf: \"$outconf\"" echo " apache_conf:\"$apache_conf\"" +echo " card_hand: $card_hand" echo " players_n: $players_n" -echo " tables_n: $tables_n" +echo " tables_n: $tables_n" echo " tables_auth_n: $tables_auth_n" echo " brisk_auth_conf: \"$brisk_auth_conf\"" echo " brisk_debug:\"$brisk_debug\"" @@ -182,6 +196,7 @@ echo " brisk_conf: \"$brisk_conf\"" echo " usock_path: \"$usock_path\"" echo " sys_user: \"$sys_user\"" echo " web_only: \"$web_only\"" +echo " test_add: \"$test_add\"" if [ ! -z "$outconf" ]; then ( @@ -189,6 +204,7 @@ if [ ! -z "$outconf" ]; then echo "# Produced automatically by brisk::INSTALL.sh" echo "#" echo "apache_conf=$apache_conf" + echo "card_hand=$card_hand" echo "players_n=$players_n" echo "tables_n=$tables_n" echo "tables_auth_n=$tables_auth_n" @@ -203,6 +219,7 @@ if [ ! -z "$outconf" ]; then echo "usock_path=\"$usock_path\"" echo "sys_user=\"$sys_user\"" echo "web_only=\"$web_only\"" + echo "test_add=\"$test_add\"" ) > "$outconf" fi @@ -249,6 +266,11 @@ IFS=' # ftokk_path="${ftok_path}k" +if [ $card_hand -lt 3 -o $card_hand -gt 8 ]; then + echo "card_hand ($card_hand) out of range (3 <= c <= 8)" + exit 1 +fi + if [ $players_n -ne 3 -a $players_n -ne 5 ]; then echo "players_n ($players_n) out of range (3|5)" exit 1 @@ -318,9 +340,15 @@ for i in $(find web -type d | sed 's/^....//g'); do 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' | sed 's/^....//g'); do +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 install -m 644 "web/$i" "${web_path}__/$i" done +if [ "$test_add" = "TRUE" ]; then + for i in $(find webtest -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 + install -m 644 "webtest/$i" "${web_path}__/$i" + done +fi + chmod 755 "${web_path}__/spush/brisk-spush.php" prefix_path_len=$(echo -n "$prefix_path" | wc -c) @@ -332,6 +360,7 @@ else fi # .js substitutions +sed -i "s/CARD_HAND *= *[0-9]\+/CARD_HAND = $card_hand/g" $(find ${web_path}__ -type f -name '*.js' -exec grep -l 'CARD_HAND *= *[0-9]\+' {} \;) sed -i "s/PLAYERS_N *= *[0-9]\+/PLAYERS_N = $players_n/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]\+' {} \;) @@ -339,6 +368,8 @@ sed -i "s/^var G_send_time *= *[0-9]\+/var G_send_time = $send_time/g" $(find ${ # .ph[pho] substitutions sed -i "s/define *( *'PLAYERS_N', *[0-9]\+ *)/define('PLAYERS_N', $players_n)/g" $(find ${web_path}__ -type f -name '*.ph*' -exec grep -l "define *( *'PLAYERS_N', *[0-9]\+ *)" {} \;) +sed -i "s/define *( *'BIN5_CARD_HAND', *[0-9]\+ *)/define('BIN5_CARD_HAND', $card_hand)/g" $(find ${web_path}__ -type f -name '*.ph*' -exec grep -l "define *( *'BIN5_CARD_HAND', *[0-9]\+ *)" {} \;) + sed -i "s/define *( *'BIN5_PLAYERS_N', *[0-9]\+ *)/define('BIN5_PLAYERS_N', $players_n)/g" $(find ${web_path}__ -type f -name '*.ph*' -exec grep -l "define *( *'BIN5_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',[^)]*)" {} \;) @@ -385,7 +416,7 @@ if [ -f "$etc_path/$brisk_conf" ]; then echo "Config file $etc_path/$brisk_conf exists." echo "=== Dump the diff. ===" # diff -u "$etc_path/$brisk_conf" "${web_path}__""/Obj/brisk.conf-templ.pho" - diff -u <(cat "$etc_path/$brisk_conf" | grep '\$[a-zA-Z_ ]\+=' | sed 's/ = .*/ = /g' | sort | uniq) <(cat "${web_path}__""/Obj/brisk.conf-templ.pho" | grep '\$[a-zA-Z_ ]\+=' | sed 's/ = .*/ = /g' | sort | uniq ) + diff -u <(cat "$etc_path/$brisk_conf" | egrep -v '^//|^#' | grep '\$[a-zA-Z_ ]\+=' | sed 's/ \+= .*/ = /g' | sort | uniq) <(cat "${web_path}__""/Obj/brisk.conf-templ.pho" | egrep -v '^//|^#' | grep '\$[a-zA-Z_ ]\+=' | sed 's/ \+= .*/ = /g' | sort | uniq ) echo "=== End dump. ===" else echo "Config file $etc_path/$brisk_conf not exists." @@ -400,4 +431,10 @@ fi if [ "$web_only" = "FALSE" ]; then mv "$ftokk_path" "$ftok_path" fi +if [ -f WARNING.txt ]; then + echo ; echo " ==== WARNING ====" + echo + cat WARNING.txt + echo +fi exit 0