From 9408c975fe199c4ef4d662dee05f4f684167b731 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 26 Feb 2014 08:07:10 +0100 Subject: utils.pm: use FindBin instead of awk to find the path to 'use lib utils.pm' is not valid Perl syntax: Bareword "utils" not allowed while "strict subs" in use at plugins-scripts/check_ircd.pl line 52. Bareword "pm" not allowed while "strict subs" in use at plugins-scripts/check_ircd.pl line 52. This makes it impossible to use the plugins directly from the git tree, e.g. while hacking on them. Using FindBin::Bin as the library path allows that, while preserving the original behaviour of adding the libexec path when the plugin is properly installed. --- plugins-scripts/check_breeze.pl | 3 ++- plugins-scripts/check_disk_smb.pl | 3 ++- plugins-scripts/check_flexlm.pl | 3 ++- plugins-scripts/check_ifoperstatus.pl | 3 ++- plugins-scripts/check_ifstatus.pl | 3 ++- plugins-scripts/check_ircd.pl | 3 ++- plugins-scripts/check_mailq.pl | 3 ++- plugins-scripts/check_netdns.pl | 3 ++- plugins-scripts/check_rpc.pl | 3 ++- plugins-scripts/check_wave.pl | 3 ++- 10 files changed, 20 insertions(+), 10 deletions(-) (limited to 'plugins-scripts') diff --git a/plugins-scripts/check_breeze.pl b/plugins-scripts/check_breeze.pl index a4e8542c..5ff4fcfa 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 8b6cd2eb..b0a61144 100755 --- a/plugins-scripts/check_disk_smb.pl +++ b/plugins-scripts/check_disk_smb.pl @@ -24,7 +24,8 @@ use strict; 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 574c1ccf..a0b007fb 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 a431cf37..26fae76d 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 b8faada9..588e5df3 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 7612a0ef..e45e9fc1 100755 --- a/plugins-scripts/check_ircd.pl +++ b/plugins-scripts/check_ircd.pl @@ -49,7 +49,8 @@ use strict; 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 8293e9c6..a7de87bf 100755 --- a/plugins-scripts/check_mailq.pl +++ b/plugins-scripts/check_mailq.pl @@ -31,7 +31,8 @@ use Getopt::Long; 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 ecdbdb1a..5b246429 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 474067e3..3a6f7179 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 2671112a..b8ec3f03 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; -- cgit v1.2.3-74-g34f1