Преглед изворни кода

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.
Evgeni Golov пре 12 година
родитељ
комит
6b8584db99

+ 2 - 1
plugins-scripts/check_breeze.pl

@@ -4,7 +4,8 @@
 use strict;
 use strict;
 use Getopt::Long;
 use Getopt::Long;
 use vars qw($opt_V $opt_h $opt_w $opt_c $opt_H $opt_C $PROGNAME);
 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);
 use utils qw(%ERRORS &print_revision &support &usage);
 
 
 $PROGNAME = "check_breeze";
 $PROGNAME = "check_breeze";

+ 2 - 1
plugins-scripts/check_disk_smb.pl

@@ -24,7 +24,8 @@ use strict;
 use Getopt::Long;
 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($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 vars qw($PROGNAME);
-use lib utils.pm ;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
 use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
 
 
 sub print_help ();
 sub print_help ();

+ 2 - 1
plugins-scripts/check_flexlm.pl

@@ -35,7 +35,8 @@
 use strict;
 use strict;
 use Getopt::Long;
 use Getopt::Long;
 use vars qw($opt_V $opt_h $opt_F $opt_t $verbose $PROGNAME);
 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);
 use utils qw(%ERRORS &print_revision &support &usage);
 
 
 $PROGNAME="check_flexlm";
 $PROGNAME="check_flexlm";

+ 2 - 1
plugins-scripts/check_ifoperstatus.pl

@@ -34,7 +34,8 @@
 
 
 use POSIX;
 use POSIX;
 use strict;
 use strict;
-use lib utils.pm ;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 
 
 use Net::SNMP;
 use Net::SNMP;

+ 2 - 1
plugins-scripts/check_ifstatus.pl

@@ -32,7 +32,8 @@
 
 
 use POSIX;
 use POSIX;
 use strict;
 use strict;
-use lib utils.pm ;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 
 
 use Net::SNMP;
 use Net::SNMP;

+ 2 - 1
plugins-scripts/check_ircd.pl

@@ -51,7 +51,8 @@ use strict;
 use Getopt::Long;
 use Getopt::Long;
 use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $verbose);
 use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $verbose);
 use vars qw($PROGNAME);
 use vars qw($PROGNAME);
-use lib utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
 use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
 
 
 # ----------------------------------------------------[ Function Prototypes ]--
 # ----------------------------------------------------[ Function Prototypes ]--

+ 2 - 1
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
 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
 					$opt_M $mailq $status $state $msg $msg_q $msg_p $opt_W $opt_C $mailq @lines
 					%srcdomains %dstdomains);
 					%srcdomains %dstdomains);
-use lib  utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw(%ERRORS &print_revision &support &usage );
 use utils qw(%ERRORS &print_revision &support &usage );
 
 
 
 

+ 2 - 1
plugins-scripts/check_netdns.pl

@@ -27,7 +27,8 @@
 
 
 use Getopt::Long;
 use Getopt::Long;
 use Net::DNS;
 use Net::DNS;
-use lib utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils ;
 use utils ;
 
 
 my $PROGNAME = "check_netdns";
 my $PROGNAME = "check_netdns";

+ 2 - 1
plugins-scripts/check_rpc.pl

@@ -20,7 +20,8 @@
 #
 #
 
 
 use strict;
 use strict;
-use lib utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 use vars qw($PROGNAME);
 use vars qw($PROGNAME);
 my ($verbose,@proto,%prognum,$host,$response,$prognum,$port,$cmd,$progver,$state);
 my ($verbose,@proto,%prognum,$host,$response,$prognum,$port,$cmd,$progver,$state);

+ 2 - 1
plugins-scripts/check_wave.pl

@@ -3,7 +3,8 @@
 
 
 
 
 use strict;
 use strict;
-use lib utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 use vars qw($PROGNAME);
 use vars qw($PROGNAME);
 use Getopt::Long;
 use Getopt::Long;