Update of /home/cvsd/slony1/slony1-engine/tests
In directory main.slony.info:/tmp/cvs-serv20384/tests

Modified Files:
	run_test.sh support_funcs.sh 
Log Message:
Fix various bash-isms; nonportable constructs that made their way into
sundry shell scripts.  Per bug #54, reported by Peter Eisentraut.


Index: support_funcs.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/support_funcs.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** support_funcs.sh	11 Apr 2008 15:37:08 -0000	1.9
--- support_funcs.sh	7 Jul 2008 21:16:03 -0000	1.10
***************
*** 217,221 ****
      CLNAME="\"_${CLUSTER1}\""
  
!     if [[ x$DESC = x'' ]]; then
  	OK="true"
      else
--- 217,221 ----
      CLNAME="\"_${CLUSTER1}\""
  
!     if [ x$DESC = x'' ]; then
  	OK="true"
      else

Index: run_test.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/run_test.sh,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** run_test.sh	26 May 2008 20:50:34 -0000	1.23
--- run_test.sh	7 Jul 2008 21:16:03 -0000	1.24
***************
*** 266,270 ****
  	$pgbindir/psql -h $host -p $port $db $user < $testname/init_schema.sql 1> ${mktmp}/init_schema.sql.${originnode} 2>${mktmp}/init_schema.sql.${originnode}
  	status "setting up user ${weakuser} to have weak access to data"
! 	. ${testname}/gen_weak_user.sh ${weakuser} > ${mktmp}/grant_weak_access.sql
                   $pgbindir/psql -h $host -p $port -d $db -U $user < ${mktmp}/grant_weak_access.sql > ${mktmp}/genweakuser.sql.${originnode} 2> ${mktmp}/genweakuser.sql.${originnode}
  	status "done"
--- 266,270 ----
  	$pgbindir/psql -h $host -p $port $db $user < $testname/init_schema.sql 1> ${mktmp}/init_schema.sql.${originnode} 2>${mktmp}/init_schema.sql.${originnode}
  	status "setting up user ${weakuser} to have weak access to data"
! 	$SHELL ${testname}/gen_weak_user.sh ${weakuser} > ${mktmp}/grant_weak_access.sql
                   $pgbindir/psql -h $host -p $port -d $db -U $user < ${mktmp}/grant_weak_access.sql > ${mktmp}/genweakuser.sql.${originnode} 2> ${mktmp}/genweakuser.sql.${originnode}
  	status "done"
***************
*** 510,514 ****
      echo "sql_on_connection=\"SET log_min_duration_statement to '1000';\"" >> ${CONFFILE}
      echo "lag_interval=\"0 minutes\"" >> ${CONFFILE}
!     if [ "x${archive}" == "xtrue" ]; then
  	status "slonconf configures archive logging for node ${node}"
  	echo "archive_dir='${mktmp}/archive_logs_${node}'" >> ${CONFFILE}
--- 510,514 ----
      echo "sql_on_connection=\"SET log_min_duration_statement to '1000';\"" >> ${CONFFILE}
      echo "lag_interval=\"0 minutes\"" >> ${CONFFILE}
!     if [ "x${archive}" = "xtrue" ]; then
  	status "slonconf configures archive logging for node ${node}"
  	echo "archive_dir='${mktmp}/archive_logs_${node}'" >> ${CONFFILE}
***************
*** 530,534 ****
  
    conninfo="dbname=${odb} host=${ohost} user=${ouser} port=${oport}"
!   if [ "x${slonconf}" == "xtrue" ]; then
        build_slonconf ${originnode} "${conninfo}"
        slonparms=" -f ${mktmp}/slon-conf.${originnode} "
--- 530,534 ----
  
    conninfo="dbname=${odb} host=${ohost} user=${ouser} port=${oport}"
!   if [ "x${slonconf}" = "xtrue" ]; then
        build_slonconf ${originnode} "${conninfo}"
        slonparms=" -f ${mktmp}/slon-conf.${originnode} "
***************
*** 555,559 ****
    while : ; do
        eval archive=\$ARCHIVE${node}
!       if [ "x${archive}" == "xtrue" ]; then
  	  ARCHIVENODE=${node}
        fi
--- 555,559 ----
    while : ; do
        eval archive=\$ARCHIVE${node}
!       if [ "x${archive}" = "xtrue" ]; then
  	  ARCHIVENODE=${node}
        fi
***************
*** 586,590 ****
  	status "Considering node ${node}"
  
!         if [ "x${archive}" == "xtrue" ]; then
            status "Creating log shipping directory - $mktmp/archive_logs_${node}"
            mkdir -p $mktmp/archive_logs_${node}
--- 586,590 ----
  	status "Considering node ${node}"
  
!         if [ "x${archive}" = "xtrue" ]; then
            status "Creating log shipping directory - $mktmp/archive_logs_${node}"
            mkdir -p $mktmp/archive_logs_${node}
***************
*** 595,599 ****
          conninfo="dbname=${db} host=${host} user=${user} port=${port}"
  
! 	if [ "x${slonconf}" == "xtrue" ]; then
  	    build_slonconf ${node} "${conninfo}"
  	    status "launching: $pgbindir/slon -f ${CONFFILE}"
--- 595,599 ----
          conninfo="dbname=${db} host=${host} user=${user} port=${port}"
  
! 	if [ "x${slonconf}" = "xtrue" ]; then
  	    build_slonconf ${node} "${conninfo}"
  	    status "launching: $pgbindir/slon -f ${CONFFILE}"