diff --git a/plugins-scripts/check_breeze.pl b/plugins-scripts/check_breeze.pl index a4e8542cb..5ff4fcfa6 100755 --- a/plugins-scripts/check_breeze.pl +++ b/plugins-scripts/check_breeze.pl @@ -4,7 +4,8 @@ use strict; use Getopt::Long; use vars qw($opt_V $opt_h $opt_w $opt_c $opt_H $opt_C $PROGNAME); -use lib utils.pm ; +use FindBin; +use lib "$FindBin::Bin"; use utils qw(%ERRORS &print_revision &support &usage); $PROGNAME = "check_breeze"; diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl index 8b6cd2ebe..b0a61144a 100755 --- a/plugins-scripts/check_disk_smb.pl +++ b/plugins-scripts/check_disk_smb.pl @@ -24,7 +24,8 @@ use Getopt::Long; use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $opt_a $verbose); use vars qw($PROGNAME); -use lib utils.pm ; +use FindBin; +use lib "$FindBin::Bin"; use utils qw($TIMEOUT %ERRORS &print_revision &support &usage); sub print_help (); diff --git a/plugins-scripts/check_flexlm.pl b/plugins-scripts/check_flexlm.pl index 574c1ccf7..a0b007fb0 100755 --- a/plugins-scripts/check_flexlm.pl +++ b/plugins-scripts/check_flexlm.pl @@ -35,7 +35,8 @@ use strict; use Getopt::Long; use vars qw($opt_V $opt_h $opt_F $opt_t $verbose $PROGNAME); -use lib utils.pm; +use FindBin; +use lib "$FindBin::Bin"; use utils qw(%ERRORS &print_revision &support &usage); $PROGNAME="check_flexlm"; diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl index a431cf372..26fae76dc 100755 --- a/plugins-scripts/check_ifoperstatus.pl +++ b/plugins-scripts/check_ifoperstatus.pl @@ -35,7 +35,8 @@ use POSIX; use strict; -use lib utils.pm ; +use FindBin; +use lib "$FindBin::Bin"; use utils qw($TIMEOUT %ERRORS &print_revision &support); use Net::SNMP; diff --git a/plugins-scripts/check_ifstatus.pl b/plugins-scripts/check_ifstatus.pl index b8faada96..588e5df38 100755 --- a/plugins-scripts/check_ifstatus.pl +++ b/plugins-scripts/check_ifstatus.pl @@ -32,7 +32,8 @@ use POSIX; use strict; -use lib utils.pm ; +use FindBin; +use lib "$FindBin::Bin"; use utils qw($TIMEOUT %ERRORS &print_revision &support); use Net::SNMP; diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl index 7612a0ef6..e45e9fc1f 100755 --- a/plugins-scripts/check_ircd.pl +++ b/plugins-scripts/check_ircd.pl @@ -49,7 +49,8 @@ use Getopt::Long; use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $verbose); use vars qw($PROGNAME); -use lib utils.pm; +use FindBin; +use lib "$FindBin::Bin"; use utils qw($TIMEOUT %ERRORS &print_revision &support &usage); # ----------------------------------------------------[ Function Prototypes ]-- diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl index 2a805b625..75ac03810 100755 --- a/plugins-scripts/check_mailq.pl +++ b/plugins-scripts/check_mailq.pl @@ -31,7 +31,8 @@ use vars qw($opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c $opt_t $opt_M $mailq $status $state $msg $msg_q $msg_p $opt_W $opt_C $mailq @lines %srcdomains %dstdomains); -use lib utils.pm; +use FindBin; +use lib "$FindBin::Bin"; use utils qw(%ERRORS &print_revision &support &usage ); diff --git a/plugins-scripts/check_netdns.pl b/plugins-scripts/check_netdns.pl index ecdbdb1a3..5b2464295 100755 --- a/plugins-scripts/check_netdns.pl +++ b/plugins-scripts/check_netdns.pl @@ -27,7 +27,8 @@ use Getopt::Long; use Net::DNS; -use lib utils.pm; +use FindBin; +use lib "$FindBin::Bin"; use utils ; my $PROGNAME = "check_netdns"; diff --git a/plugins-scripts/check_rpc.pl b/plugins-scripts/check_rpc.pl index 474067e36..3a6f7179a 100755 --- a/plugins-scripts/check_rpc.pl +++ b/plugins-scripts/check_rpc.pl @@ -20,7 +20,8 @@ # use strict; -use lib utils.pm; +use FindBin; +use lib "$FindBin::Bin"; use utils qw($TIMEOUT %ERRORS &print_revision &support); use vars qw($PROGNAME); my ($verbose,@proto,%prognum,$host,$response,$prognum,$port,$cmd,$progver,$state); diff --git a/plugins-scripts/check_wave.pl b/plugins-scripts/check_wave.pl index 2671112a0..b8ec3f03b 100755 --- a/plugins-scripts/check_wave.pl +++ b/plugins-scripts/check_wave.pl @@ -3,7 +3,8 @@ use strict; -use lib utils.pm; +use FindBin; +use lib "$FindBin::Bin"; use utils qw($TIMEOUT %ERRORS &print_revision &support); use vars qw($PROGNAME); use Getopt::Long; diff --git a/plugins-scripts/subst.in b/plugins-scripts/subst.in index a70ad8842..66777d75e 100644 --- a/plugins-scripts/subst.in +++ b/plugins-scripts/subst.in @@ -19,19 +19,6 @@ function which(c,path) { return c; } -# used to replace "use lib utils.pm" with "use lib @libexecdir" -# -function led() { - led1 = "@libexecdir@"; - led2 = "@exec_prefix@"; - led3 = "@prefix@"; - if ( match(led1, /^\$\{exec_prefix\}/ ) != 0 ) { - return "\"" led3 "/libexec\" " ; - - } - return "\"" led1 "\"" ; -} - BEGIN { split(ENVIRON["PATH"] ":/sbin:/usr/sbin",path,/:/); @@ -58,10 +45,6 @@ BEGIN { sub(c,which(c,path)); } -# add to libexecdir to INC for perl utils.pm -/^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } } - - # Trusted path mechanism (deprecated) /^[ \t]*\$ENV[ \t]*\{[ \t'"]*PATH[ \t"']*\}[ \t]*=/ {