[Nagiosplug-checkins] CVS: nagiosplug/plugins-scripts check_oracle.sh,1.4,1.5

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug/plugins-scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv8891

Modified Files:
	check_oracle.sh 
Log Message:
Allow default Oracle home from oratab (reported by Walbert Oberngruber)


Index: check_oracle.sh
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins-scripts/check_oracle.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** check_oracle.sh	29 Jan 2003 20:47:56 -0000	1.4
--- check_oracle.sh	17 Mar 2003 22:22:26 -0000	1.5
***************
*** 19,28 ****
  # the sgadefORACLE_SID.dbf file.
  # 
- #
- # If you have any problems check that you have the $ORACLE_HOME
- # enviroment variable set, have $ORACLE_HOME/bin in your PATH, and
- # dont forget about your tnsnames.ora file.  when checking Local
- # Database status your ORACLE_SID is case sensitive.
- #
  
  PROGNAME=`basename $0`
--- 19,22 ----
***************
*** 46,60 ****
  
  print_help() {
! 	print_revision $PROGNAME $REVISION
! 	echo ""
! 	print_usage
! 	echo ""
! 	echo "Check remote or local TNS status and check local Database status"
! 	echo ""
    echo "--tns=SID/IP Address"
    echo "   Check remote TNS server"
    echo "--db=SID"
    echo "   Check local database (search /bin/ps for PMON process and check"
! 	echo "   filesystem for sgadefORACLE_SID.dbf"
    echo "--login=SID"
    echo "   Attempt a dummy login and alert if not ORA-01017: invalid username/password"
--- 40,54 ----
  
  print_help() {
!   print_revision $PROGNAME $REVISION
!   echo ""
!   print_usage
!   echo ""
!   echo "Check remote or local TNS status and check local Database status"
!   echo ""
    echo "--tns=SID/IP Address"
    echo "   Check remote TNS server"
    echo "--db=SID"
    echo "   Check local database (search /bin/ps for PMON process and check"
!   echo "   filesystem for sgadefORACLE_SID.dbf"
    echo "--login=SID"
    echo "   Attempt a dummy login and alert if not ORA-01017: invalid username/password"
***************
*** 70,84 ****
    echo "   Check remote Oracle Names server"
    echo "--help"
! 	echo "   Print this help screen"
    echo "--version"
! 	echo "   Print version and license information"
! 	echo ""
    echo "If the plugin doesn't work, check that the ORACLE_HOME environment"
! 	echo "variable is set, that ORACLE_HOME/bin is in your PATH, and the"
    echo "tnsnames.ora file is locatable and is properly configured."
    echo ""
    echo "When checking Local Database status your ORACLE_SID is case sensitive."
    echo ""
! 	support
  }
  
--- 64,81 ----
    echo "   Check remote Oracle Names server"
    echo "--help"
!   echo "   Print this help screen"
    echo "--version"
!   echo "   Print version and license information"
!   echo ""
    echo "If the plugin doesn't work, check that the ORACLE_HOME environment"
!   echo "variable is set, that ORACLE_HOME/bin is in your PATH, and the"
    echo "tnsnames.ora file is locatable and is properly configured."
    echo ""
    echo "When checking Local Database status your ORACLE_SID is case sensitive."
    echo ""
!   echo "If you want to use a default Oracle home, add in your oratab file:"
!   echo "*:/opt/app/oracle/product/7.3.4:N"
!   echo ""
!   support
  }
  
***************
*** 124,128 ****
  		while read SID ORACLE_HOME junk;
  		do
! 			if [ "$SID" = "$2" ] ; then
  				echo $ORACLE_HOME;
  				exit;
--- 121,125 ----
  		while read SID ORACLE_HOME junk;
  		do
! 			if [ "$SID" = "$2" -o "$SID" = "*" ] ; then
  				echo $ORACLE_HOME;
  				exit;