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

Modified Files:
      Tag: REL_1_2_STABLE
	check_slon.sh check_slony_cluster.sh launch_clusters.sh 
	mkslonconf.sh pull-gborg-mail.sh release_checklist.sh 
	search-logs.sh 
Log Message:
Per Peter Eisentraut, changes to make tools more portable, removing some
"bash-isms"


Index: release_checklist.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/release_checklist.sh,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** release_checklist.sh	29 Aug 2007 05:44:58 -0000	1.1.2.5
--- release_checklist.sh	12 Sep 2008 16:09:23 -0000	1.1.2.6
***************
*** 18,22 ****
  VERCOMMA="${MAJOR},${MINOR},${PATCHLEVEL}"
  VERUNDERSCORE="${MAJOR}_${MINOR}_${PATCHLEVEL}"
! if [[ `egrep "#define SLONY_I_VERSION_STRING_DEC ${VERCOMMA}\$" config.h.in` ]]; then
     echo "SLONY_I_VERSION_STRING_DEC matches"
  else
--- 18,22 ----
  VERCOMMA="${MAJOR},${MINOR},${PATCHLEVEL}"
  VERUNDERSCORE="${MAJOR}_${MINOR}_${PATCHLEVEL}"
! if egrep "#define SLONY_I_VERSION_STRING_DEC ${VERCOMMA}\$" config.h.in >/dev/null 2>&1; then
     echo "SLONY_I_VERSION_STRING_DEC matches"
  else
***************
*** 44,48 ****
      FLIST="${FLIST} $file"
  done
! if [[ x = x"$FLIST" ]]; then
      echo "autoconf has probably been run lately..."
  else
--- 44,48 ----
      FLIST="${FLIST} $file"
  done
! if [ x = x"$FLIST" ]; then
      echo "autoconf has probably been run lately..."
  else
***************
*** 53,57 ****
  STOREDPROCVERS=`awk  -f tools/awk-for-stored-proc-vers.awk  src/backend/slony1_funcs.sql`
  
! if [[ x"$STOREDPROCVERS" = x"$VERDOTTED" ]]; then
     OK=1
     echo "Stored proc version numbers match ${VERDOTTED}"
--- 53,57 ----
  STOREDPROCVERS=`awk  -f tools/awk-for-stored-proc-vers.awk  src/backend/slony1_funcs.sql`
  
! if [ x"$STOREDPROCVERS" = x"$VERDOTTED" ]; then
     OK=1
     echo "Stored proc version numbers match ${VERDOTTED}"

Index: pull-gborg-mail.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/pull-gborg-mail.sh,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** pull-gborg-mail.sh	7 Sep 2006 16:27:28 -0000	1.1
--- pull-gborg-mail.sh	12 Sep 2008 16:09:23 -0000	1.1.2.1
***************
*** 17,21 ****
  ARG=$1
  
! if [[ x$ARG == "xINIT" ]] ; then
     for year in 2004 2005 2006; do
       for month in January February March April May June July August September October November December; do
--- 17,21 ----
  ARG=$1
  
! if [ x$ARG = "xINIT" ] ; then
     for year in 2004 2005 2006; do
       for month in January February March April May June July August September October November December; do
***************
*** 37,39 ****
  	done
      done
! fi
\ No newline at end of file
--- 37,39 ----
  	done
      done
! fi

Index: launch_clusters.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/launch_clusters.sh,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -d -r1.2.2.3 -r1.2.2.4
*** launch_clusters.sh	4 Oct 2007 15:17:38 -0000	1.2.2.3
--- launch_clusters.sh	12 Sep 2008 16:09:23 -0000	1.2.2.4
***************
*** 61,65 ****
      LOGHOME=$3
  
!     if [[ -e $CONFIGPATH/conf/node${NODENUM}.conf ]] ; then
  	SLONCONF="$CONFIGPATH/conf/node${NODENUM}.conf"
  	SLONPIDFILE=`grep "^ *pid_file=" $SLONCONF | cut -d "=" -f 2 | cut -d "#" -f 1 | cut -d " " -f 1 | cut -d "'" -f 2`
--- 61,65 ----
      LOGHOME=$3
  
!     if [ -e $CONFIGPATH/conf/node${NODENUM}.conf ]; then
  	SLONCONF="$CONFIGPATH/conf/node${NODENUM}.conf"
  	SLONPIDFILE=`grep "^ *pid_file=" $SLONCONF | cut -d "=" -f 2 | cut -d "#" -f 1 | cut -d " " -f 1 | cut -d "'" -f 2`
***************
*** 85,93 ****
  	      ;;
      esac
!     if [[ -e $SLONPIDFILE ]] ; then
  	SLONPID=`cat $SLONPIDFILE`
  
  	FINDIT=`ps -p ${SLONPID} -o ${PSCOMM}= | grep slon`
! 	if [[ -z $FINDIT ]]; then
          # Need to restart slon
  	    log_action "slon died for config $CONFIGPATH/conf/node${NODENUM}.conf"
--- 85,93 ----
  	      ;;
      esac
!     if [ -e $SLONPIDFILE ] ; then
  	SLONPID=`cat $SLONPIDFILE`
  
  	FINDIT=`ps -p ${SLONPID} -o ${PSCOMM}= | grep slon`
! 	if [ -z $FINDIT ]; then
          # Need to restart slon
  	    log_action "slon died for config $CONFIGPATH/conf/node${NODENUM}.conf"
***************
*** 98,102 ****
      else
          ${BPS} auxww | egrep "[s]lon -f $CONFIGPATH/conf/node${NODENUM}.conf" > /dev/null
! 	if [[ $? -eq 0 ]] ; then 	
              echo "Slon already running - but PID marked dead"
  	else
--- 98,102 ----
      else
          ${BPS} auxww | egrep "[s]lon -f $CONFIGPATH/conf/node${NODENUM}.conf" > /dev/null
! 	if [ $? -eq 0 ] ; then 	
              echo "Slon already running - but PID marked dead"
  	else

Index: mkslonconf.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/mkslonconf.sh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** mkslonconf.sh	31 May 2006 21:11:29 -0000	1.2
--- mkslonconf.sh	12 Sep 2008 16:09:23 -0000	1.2.2.1
***************
*** 157,161 ****
      echo "Generating slon conf file $conffile"
  
!     if [[ -e $conffile ]] ; then
  	echo "config file $conffile already exists."
  	echo "Do you want to (Overwrite) it or (Skip) it (Anything else aborts) [Overwrite|Skip]?"
--- 157,161 ----
      echo "Generating slon conf file $conffile"
  
!     if [ -e $conffile ] ; then
  	echo "config file $conffile already exists."
  	echo "Do you want to (Overwrite) it or (Skip) it (Anything else aborts) [Overwrite|Skip]?"

Index: check_slon.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/check_slon.sh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** check_slon.sh	21 Jun 2006 17:41:19 -0000	1.3
--- check_slon.sh	12 Sep 2008 16:09:23 -0000	1.3.2.1
***************
*** 21,25 ****
  
  # check parameters are valid
! if [[ $# -lt 2 || $# -gt 3 ]]
  then
     echo "Invalid parameters need CLUSTERNAME DBNAME DBHOST [LOGFILE]"
--- 21,25 ----
  
  # check parameters are valid
! if [ $# -lt 2 ] || [ $# -gt 3 ]
  then
     echo "Invalid parameters need CLUSTERNAME DBNAME DBHOST [LOGFILE]"

Index: check_slony_cluster.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/check_slony_cluster.sh,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C2 -d -r1.3.4.1 -r1.3.4.2
*** check_slony_cluster.sh	22 Aug 2007 17:50:08 -0000	1.3.4.1
--- check_slony_cluster.sh	12 Sep 2008 16:09:23 -0000	1.3.4.2
***************
*** 71,75 ****
  STATUS=`echo $CHECK | awk '{print $1}'`
  NODESOK=`echo $CHECK | awk '{print $3}'`
! if [[ $STATUS = "OK"  && $NODESOK != "0" ]]
  then
     exit 0
--- 71,75 ----
  STATUS=`echo $CHECK | awk '{print $1}'`
  NODESOK=`echo $CHECK | awk '{print $3}'`
! if [ $STATUS = "OK" ] && [ $NODESOK != "0" ]
  then
     exit 0

Index: search-logs.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/search-logs.sh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** search-logs.sh	16 Nov 2006 20:02:14 -0000	1.1.2.2
--- search-logs.sh	12 Sep 2008 16:09:23 -0000	1.1.2.3
***************
*** 11,15 ****
  EXCLUSIONS="No Exclusions Known"
  
! if [[ -z $LOGTIMESTAMP ]] ; then
      HRRE=`date -d "1 hour ago" +"%Y-%m-%d %H:[0-9][0-9]:[0-9][0-9] ${TZ}"`
  else
--- 11,15 ----
  EXCLUSIONS="No Exclusions Known"
  
! if [ -z $LOGTIMESTAMP ] ; then
      HRRE=`date -d "1 hour ago" +"%Y-%m-%d %H:[0-9][0-9]:[0-9][0-9] ${TZ}"`
  else
***************
*** 20,24 ****
      egrep "${HRRE} (ERROR|FATAL)" $log | egrep -v "${EXCLUSIONS}" > /tmp/slony-errors.$$ 
  
!     if [[ -s /tmp/slony-errors.$$ ]] ; then 
          echo "
  Errors in log ${log} 
--- 20,24 ----
      egrep "${HRRE} (ERROR|FATAL)" $log | egrep -v "${EXCLUSIONS}" > /tmp/slony-errors.$$ 
  
!     if [ -s /tmp/slony-errors.$$ ] ; then 
          echo "
  Errors in log ${log} 
***************
*** 28,33 ****
  done 
   
! if [[ -s /tmp/slony-summary.$$ ]] ; then 
!     if [[ -z $LOGRECIPIENT ]] ; then
  	echo "Errors found!"
  	cat /tmp/slony-summary.$$  
--- 28,33 ----
  done 
   
! if [ -s /tmp/slony-summary.$$ ] ; then 
!     if [ -z $LOGRECIPIENT ] ; then
  	echo "Errors found!"
  	cat /tmp/slony-summary.$$