=================================================================== RCS file: /cvs/nagios/check_hw_sensors/check_hw_sensors,v retrieving revision 1.37 retrieving revision 1.40 diff -u -r1.37 -r1.40 --- nagios/check_hw_sensors/check_hw_sensors 2009/11/10 23:41:12 1.37 +++ nagios/check_hw_sensors/check_hw_sensors 2009/11/11 18:14:40 1.40 @@ -1,5 +1,5 @@ #!/usr/bin/perl -T -# $RedRiver: check_hw_sensors,v 1.36 2009/11/10 23:26:13 andrew Exp $ +# $RedRiver: check_hw_sensors,v 1.39 2009/11/11 18:14:00 andrew Exp $ ######################################################################## # check_hw_sensors *** A nagios check for OpenBSD sysctl hw.sensors # @@ -29,7 +29,14 @@ use POSIX; use Config; -use lib '/usr/local/libexec/nagios'; +my $PREFIX; + +BEGIN { + ## no critic 'warnings' + no warnings 'uninitialized'; + $PREFIX = "${PREFIX}" || '/usr/local'; # Magic for OpenBSD ports tree +} +use lib $PREFIX . '/libexec/nagios'; use utils qw($TIMEOUT %ERRORS &support); use Getopt::Long; @@ -69,7 +76,7 @@ } if ($opt_V) { - print_revision( $PROGNAME, '$Revision: 1.37 $ ' ); + print_revision( $PROGNAME, '$Revision: 1.40 $ ' ); exit $ERRORS{'OK'}; } @@ -154,7 +161,7 @@ print $error . ' (' . scalar( @{ $STATES{$error} } ) . ')'; if ( $error ne 'OK' ) { print '
'; - print map { s/\s+//xms; " - $_
" } @{ $STATES{$error} }; + print map {" - $_
"} @{ $STATES{$error} }; } } else { @@ -529,7 +536,7 @@ EOL - print_revision( $PROGNAME, '$Revision: 1.37 $' ); + print_revision( $PROGNAME, '$Revision: 1.40 $' ); print $LICENSE;