[Serverfilters-commit] script test.sh,1.6,1.7

[<jgs...@us...>]

Update of /cvsroot/serverfilters/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13978

Modified Files:
	test.sh 
Log Message:
Improved script to make more user friendly.


Index: test.sh
===================================================================
RCS file: /cvsroot/serverfilters/script/test.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test.sh	1 Mar 2004 16:17:07 -0000	1.6
--- test.sh	2 Mar 2004 02:56:02 -0000	1.7
***************
*** 18,35 ****
  cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd getrc filter > $SCRIPTDIR/filter; 
  if [ $? == '0' ] ; then
!    echo "Pass"
  else
     echo "RESULT:" $?
  fi;
  echo '# filtercmd testing ' >> $SCRIPTDIR/filter
! cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd putrc filter;
  if [ $? == '0' ] ; then
!    echo "Pass"
  else
     echo "RESULT:" $?
  fi;
! cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd getrc filter;
  if [ $? == '0' ] ; then
!    echo "Pass"
  else
     echo "RESULT:" $?
--- 18,45 ----
  cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd getrc filter > $SCRIPTDIR/filter; 
  if [ $? == '0' ] ; then
!    echo "Pass: Filter get"
  else
     echo "RESULT:" $?
  fi;
+ cp $SCRIPTDIR/filter $SCRIPTDIR/filter.orig
  echo '# filtercmd testing ' >> $SCRIPTDIR/filter
! cat $SCRIPTDIR/test_creds $SCRIPTDIR/filter | $SCRIPTDIR/filtercmd putrc filter;
! rm $SCRIPTDIR/filter
  if [ $? == '0' ] ; then
!    echo "Pass: Filter put"
  else
     echo "RESULT:" $?
  fi;
! cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd getrc filter > $SCRIPTDIR/filter;
  if [ $? == '0' ] ; then
!    command=`grep "filtercmd testing" $SCRIPTDIR/filter`;
!    if [ -n "$command" ] ; then
!       echo "Pass: You are able to correctly retrieve and save your filter file."
!       echo "      Your filter file is saved in the current directory as 'filter'"
!       cat $SCRIPTDIR/test_creds $SCRIPTDIR/filter.orig | $SCRIPTDIR/filtercmd putrc filter 2> /dev/null;
!       mv $SCRIPTDIR/filter.orig $SCRIPTDIR/filter
!    else
!       echo "Fail: A problem occurred saving your filter file"
!    fi;
  else
     echo "RESULT:" $?