X-Git-Url: https://mop.ddnsfree.com/gitweb/?p=brisk.git;a=blobdiff_plain;f=INSTALL.sh;h=dce6e837207b50d5c7ff88e3426016e42822e867;hp=61a4bff1d5990fb063ed4489d30896e2bce9a6b9;hb=HEAD;hpb=ad7383d9a2d4465787f541e366e1ac0c7fb906f9 diff --git a/INSTALL.sh b/INSTALL.sh index 61a4bff..dce6e83 100755 --- a/INSTALL.sh +++ b/INSTALL.sh @@ -3,72 +3,58 @@ # # Defaults # +CONFIG_FILE="$HOME/.brisk_install" + +apache_conf="/etc/apache2/sites-available/default" +card_hand=3 players_n=3 -tables_n=16 -tables_auth_n=6 -brisk_auth_conf="brisk_auth2.conf.pho" -brisk_debug="0xffff" -web_path="$HOME/brisk" -legal_path="$HOME/brisk-priv" -ftok_path="$HOME/brisk-priv/ftok" -proxy_path="$HOME/brisk-priv/proxy" +tables_n=44 +tables_appr_n=12 +tables_auth_n=8 +tables_cert_n=4 +brisk_auth_conf="brisk_spu_auth.conf.pho" +brisk_debug="0x0400" +# brisk_debug="0xffff" +web_path="/home/nastasi/web/brisk" +ftok_path="/home/nastasi/brisk-priv/ftok/brisk" +proxy_path="/home/nastasi/brisk-priv/proxy/brisk" +usock_path_pfx="/home/nastasi/brisk-priv/brisk" +sys_user="www-data" +legal_path="/home/nastasi/brisk-priv/brisk" +prefix_path="/brisk/" +brisk_conf="brisk_spu.conf.pho" web_only="FALSE" -brisk_conf="brisk.conf.pho" - -if [ "$1" = "chk" ]; then - find -name '*.pho' -o -name '*.phh' -o -name '*.php' -exec php5 -l {} \; - exit 0 -fi - -if [ "$1" = "pkg" ]; then - if [ "$2" != "" ]; then - tag="$2" - else - tag="$(git describe)" - fi - nam1="brisk_${tag}.tgz" - nam2="brisk-img_${tag}.tgz" - echo "Build packages ${nam1} and ${nam2}." - 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 - - exit 0 -fi - - -if [ -f $HOME/.brisk_install ]; then - . $HOME/.brisk_install -fi -if [ "x$cookie_path" = "x" ]; then - cookie_path=$web_path -fi +test_add="FALSE" +# +# functions function usage () { echo 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 ] [-f conffile] [-p outconf] [-d TRUE|FALSE] [-w web_dir] [-k ] [-l ] [-y ] [-c ]" + echo "$1 [-W] [-n 3|5] [-c 2|8] [-t <(n>=4)>] [-T ] [-r ] [-G ] [-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 " -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\"" echo " -d activate dabug - def. $brisk_debug" 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 " -P prefix path - def. \"$prefix_path\"" echo " -C config filename - def. \"$brisk_conf\"" - + echo " -U unix socket path prefix - def. \"$usock_path_pfx\"" + echo " -u system user to run brisk dae - def. \"$sys_user\"" + echo " -x copy tests as normal php - def. \"$test_add\"" echo } @@ -97,34 +83,112 @@ function searchetc() { echo "$pp/$dname" return 0 fi - pp="`dirname "$pp"`" + pp="$(dirname "$pp")" done - + return 1 } # # MAIN # +declare -a nam +if [ "$1" = "chk" ]; then + set -e + oldifs="$IFS" + IFS=' +' + 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')" # ' emacs hell + if [ "$taggit" != "$tagphp" ]; then + echo + echo "WARNING: taggit: [$taggit] tagphp: [$tagphp]" + echo + fi + exit 0 +fi + +# before all check errors on the sources +$0 chk || exit 3 +if [ "$1" = "pkg" ]; then + if [ "$2" != "" ]; then + tag="$2" + 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" + + if [ -d ../curl-de-sac ]; then + 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}" + sep=", " + done + 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 + cd - + fi + exit 0 +fi + +if [ -f "$CONFIG_FILE" ]; then + source "$CONFIG_FILE" + conffile_in="$CONFIG_FILE" +fi + +if [ "x$prefix_path" = "x" ]; then + prefix_path="$web_path" +fi + +action="" while [ $# -gt 0 ]; do # echo aa $1 xx $2 bb conffile="" case $1 in - -f*) conffile="`get_param "-f" "$1" "$2"`"; sh=$?;; - -p*) outconf="`get_param "-p" "$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=$?;; - -a*) brisk_auth_conf="`get_param "-a" "$1" "$2"`"; sh=$?;; - -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=$?;; - -C*) brisk_conf="`get_param "-C" "$1" "$2"`"; sh=$?;; - -l*) legal_path="`get_param "-l" "$1" "$2"`"; sh=$?;; - -W) web_only="TRUE";; - -h) usage $0; exit 0;; + -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=$?;; + -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=$?;; + -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=$?;; + -P*) prefix_path="$(get_param "-P" "$1" "$2")"; sh=$?;; + -C*) brisk_conf="$(get_param "-C" "$1" "$2")"; sh=$?;; + -l*) legal_path="$(get_param "-l" "$1" "$2")"; sh=$?;; + -U*) usock_path_pfx="$(get_param "-U" "$1" "$2")"; sh=$?;; + -u*) sys_user="$(get_param "-u" "$1" "$2")"; sh=$?;; + system) action=system ; sh=1;; + -W) web_only="TRUE";; + -x) test_add="TRUE";; + -h) usage $0; exit 0;; *) usage $0; exit 1;; esac if [ ! -z "$conffile" ]; then @@ -133,6 +197,7 @@ while [ $# -gt 0 ]; do exit 1 fi . "$conffile" + conffile_in="$conffile" fi shift $sh done @@ -141,54 +206,101 @@ done # Show parameters # 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_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\"" echo " brisk_debug:\"$brisk_debug\"" echo " web_path: \"$web_path\"" echo " ftok_path: \"$ftok_path\"" echo " legal_path: \"$legal_path\"" echo " proxy_path: \"$proxy_path\"" -echo " cookie_path:\"$cookie_path\"" -echo " brisk_conf:\"$brisk_conf\"" +echo " prefix_path:\"$prefix_path\"" +echo " brisk_conf: \"$brisk_conf\"" +echo " usock_path_pfx: \"$usock_path_pfx\"" +echo " sys_user: \"$sys_user\"" echo " web_only: \"$web_only\"" +echo " test_add: \"$test_add\"" if [ ! -z "$outconf" ]; then - ( + ( echo "#" 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_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\"" 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 "prefix_path=\"$prefix_path\"" echo "brisk_conf=\"$brisk_conf\"" + echo "usock_path_pfx=\"$usock_path_pfx\"" + echo "sys_user=\"$sys_user\"" echo "web_only=\"$web_only\"" + echo "test_add=\"$test_add\"" ) > "$outconf" fi + +max_players=$((40 + players_n * tables_n)) + +if [ "$action" = "system" ]; then + scrname="$(echo "$prefix_path" | sed 's@^/@@g;s@/$@@g;s@/@_@g;')" + echo + echo "script name: [$scrname]" + echo "brisk path: [$web_path]" + echo "private path: [$legal_path]" + echo "system user: [$sys_user]" + echo + read -p "press enter to continue" sure + cp bin/brisk-init.sh brisk-init.sh.wrk + sed -i "s@^BPATH=.*@BPATH=\"${web_path}\"@g;s@^PPATH=.*@PPATH=\"${legal_path}\"@g;s@^SSUFF=.*@SSUFF=\"${scrname}\"@g;s@^BUSER=.*@BUSER=\"${sys_user}\"@g" brisk-init.sh.wrk + + su -c "cp brisk-init.sh.wrk /etc/init.d/${scrname}" + + rm brisk-init.sh.wrk + echo + echo "... DONE." + echo "DON'T FORGET: after the first installation you MUST configure your run-levels accordingly" + echo + echo "Example: su -c 'update-rc.d $scrname defaults'" + echo + exit 0 +fi # # Pre-check # # check for etc path existence -dsta="`dirname "$web_path"`" -etc_path="`searchetc "$dsta" Etc`" +dsta="$(dirname "$web_path")" +etc_path="$(searchetc "$dsta" Etc)" if [ $? -ne 0 ]; then echo "Etc directory not found" exit 1 fi +IFS=' +' # # Installation # ftokk_path="${ftok_path}k" +if [ $card_hand -lt 2 -o $card_hand -gt 8 ]; then + echo "card_hand ($card_hand) out of range (2 <= 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 @@ -212,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 @@ -224,23 +336,68 @@ if [ "$web_only" = "FALSE" ]; then chmod 666 ${ftokk_path}/warrant touch ${ftokk_path}/poll chmod 666 ${ftokk_path}/poll - for i in `seq 0 99`; do - touch ${ftokk_path}/table$i - chmod 666 ${ftokk_path}/table$i + for i in $(seq 0 $max_players); do + touch ${ftokk_path}/user$i + chmod 666 ${ftokk_path}/user$i + done + + if [ ! -d ${ftokk_path}/bin5 ]; then + mkdir ${ftokk_path}/bin5 + chmod 777 ${ftokk_path}/bin5 + fi + + for i in $(seq 0 $((tables_n - 1))); do + if [ ! -d ${ftokk_path}/bin5/table$i ]; then + mkdir ${ftokk_path}/bin5/table$i + fi + chmod 777 ${ftokk_path}/bin5/table$i + touch ${ftokk_path}/bin5/table$i/table + chmod 666 ${ftokk_path}/bin5/table$i/table + for e in $(seq 0 4); do + touch ${ftokk_path}/bin5/table$i/user$e + chmod 666 ${ftokk_path}/bin5/table$i/user$e + done + # create subdirectories in proxy path + if [ ! -d ${proxy_path}/bin5/table$i ]; then + mkdir -p ${proxy_path}/bin5/table$i + fi done + chmod -R 777 ${proxy_path}/bin5 + + mkdir -p "${legal_path}" + chmod 777 "${legal_path}" +fi + +bsk_busting="$(git rev-parse --short HEAD 2>/dev/null|| true)" +if [ "$bsk_busting" = "" ]; then + bsk_busting=$(grep '^\$G_brisk_version' web/Obj/brisk.phh | sed 's/^[^"'"'"']*["'"'"']/v/g;s/["'"'"'].*//g') fi +if [ "$bsk_busting" = "" ]; then + echo "Retreiving bsk_busting failed" + exit 1 +fi + install -d ${web_path}__ -for i in `find web -type d | grep -v /CVS | sed 's/^....//g'`; do - install -d ${web_path}__/$i +for i in $(find web -type d | grep '/' | 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' -o -name 'terms-of-service*' | 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 +# hardlink for nginx managed websocket files. +ln "${web_path}__/xynt_test01.php" "${web_path}__/xynt_test01_wss.php" + +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) if [ $players_n -eq 5 ]; then send_time=250 @@ -249,50 +406,65 @@ else fi # .js substitutions -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/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]\+' {} \;` +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[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 *( *BRISKIN5_PLAYERS_N, *[0-9]\+ *)/define(BRISKIN5_PLAYERS_N, $players_n)/g" `find ${web_path}__ -type f -name '*.ph*' -exec grep -l 'define *( *BRISKIN5_PLAYERS_N, *[0-9]\+ *)' {} \;` +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 *( *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 *( *'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 *( *TABLES_N,[^)]*)@define(TABLES_N, $tables_n)@g" ${web_path}__/Obj/brisk.phh +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 *( *TABLES_AUTH_N,[^)]*)@define(TABLES_AUTH_N, $tables_auth_n)@g" ${web_path}__/Obj/brisk.phh +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 *( *'SITE_PREFIX',[^)]*)@define('SITE_PREFIX', \"$prefix_path\")@g; +s@define *( *'SITE_PREFIX_LEN',[^)]*)@define('SITE_PREFIX_LEN', $prefix_path_len)@g" ${web_path}__/Obj/sac-a-push.phh -sed -i "s@define *( *LEGAL_PATH,[^)]*)@define(LEGAL_PATH, \"$legal_path\")@g" ${web_path}__/Obj/brisk.phh +sed -i "s@define *( *'USOCK_PATH_PFX',[^)]*)@define('USOCK_PATH_PFX', \"$usock_path_pfx\")@g" ${web_path}__/spush/brisk-spush.phh -sed -i "s@define *( *PROXY_PATH,[^)]*)@define(PROXY_PATH, \"$proxy_path\")@g" ${web_path}__/Obj/brisk.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; +s@define *( *'LEGAL_PATH',[^)]*)@define('LEGAL_PATH', \"$legal_path\")@g; +s@define *( *'PROXY_PATH',[^)]*)@define('PROXY_PATH', \"$proxy_path\")@g; +s@define *( *'BSK_BUSTING',[^)]*)@define('BSK_BUSTING', \"$bsk_busting\")@g; +s@define *( *'BRISK_CONF',[^)]*)@define('BRISK_CONF', \"$brisk_conf\")@g;" ${web_path}__/Obj/brisk.phh -sed -i "s@define *( *BRISK_CONF,[^)]*)@define(BRISK_CONF, \"$brisk_conf\")@g" ${web_path}__/Obj/brisk.phh +sed -i "s@define *( *'BRISK_AUTH_CONF',[^)]*)@define('BRISK_AUTH_CONF', \"$brisk_auth_conf\")@g" ${web_path}__/Obj/auth.phh -sed -i "s@define *( *BRISK_AUTH_CONF,[^)]*)@define(BRISK_AUTH_CONF, \"$brisk_auth_conf\")@g" ${web_path}__/Obj/auth.phh +sed -i "s@var \+cookiepath \+= \+\"[^\"]*\";@var cookiepath = \"$prefix_path\";@g" ${web_path}__/commons.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 +sed -i "s@\( \+cookiepath *: *\)\"[^\"]*\" *,@\1 \"$prefix_path\",@g" ${web_path}__/xynt-streaming.js -if [ -d ${web_path} ]; then - mv ${web_path} ${web_path}.old -fi +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* ${web_path}__/donometer.php if [ -d ../brisk-img ]; then cd ../brisk-img ./INSTALL.sh -w ${web_path}__ cd - >/dev/null 2>&1 fi +if [ -d ../curl-de-sac ]; then + cd ../curl-de-sac + if [ ! -z "$conffile_in" ]; then + ./INSTALL.sh -f "$conffile_in" -w ${web_path}__ + else + ./INSTALL.sh -w ${web_path}__ + fi + cd - >/dev/null 2>&1 +fi # config file installation or diff 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." @@ -300,6 +472,10 @@ else cp "${web_path}__""/Obj/brisk.conf-templ.pho" "$etc_path/$brisk_conf" fi +if [ -d ${web_path} ]; then + mv ${web_path} ${web_path}.old +fi + mv ${web_path}__ ${web_path} if [ -d ${web_path}.old ]; then rm -rf ${web_path}.old @@ -307,4 +483,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