From 7d32d2b5f41662098f444f0f02ab1afccdeb6e41 Mon Sep 17 00:00:00 2001 From: Ton Voon Date: Wed, 2 Jul 2003 15:01:22 +0000 Subject: [PATCH] Moving check_file_age into core git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@578 f882894a-f735-0410-b71e-b25c423dba1c --- plugins-scripts/.cvsignore | 1 + plugins-scripts/Makefile.am | 6 ++++-- {contrib => plugins-scripts}/check_file_age.pl | 2 +- plugins-scripts/subst.in | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) rename {contrib => plugins-scripts}/check_file_age.pl (99%) diff --git a/plugins-scripts/.cvsignore b/plugins-scripts/.cvsignore index 341101f..3066a97 100644 --- a/plugins-scripts/.cvsignore +++ b/plugins-scripts/.cvsignore @@ -16,3 +16,4 @@ check_oracle check_rpc check_sensors check_wave +check_file_age diff --git a/plugins-scripts/Makefile.am b/plugins-scripts/Makefile.am index 411c1a0..5556cf6 100644 --- a/plugins-scripts/Makefile.am +++ b/plugins-scripts/Makefile.am @@ -6,11 +6,13 @@ VPATH=$(top_srcdir) $(top_srcdir)/plugins-scripts $(top_srcdir)/plugins-scripts/ libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \ check_log check_ntp check_oracle check_rpc check_sensors check_wave \ - check_ifstatus check_ifoperstatus check_mailq utils.sh utils.pm + check_ifstatus check_ifoperstatus check_mailq check_file_age \ + utils.sh utils.pm EXTRA_DIST=check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \ check_log.sh check_ntp.pl check_oracle.sh check_rpc.pl check_sensors.sh \ - check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl utils.sh.in utils.pm.in t + check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl check_file_age.pl \ + utils.sh.in utils.pm.in t TESTS_ENVIRONMENT=perl -I $(top_builddir) -I $(top_srcdir) diff --git a/contrib/check_file_age.pl b/plugins-scripts/check_file_age.pl similarity index 99% rename from contrib/check_file_age.pl rename to plugins-scripts/check_file_age.pl index ae9311e..2ab1a28 100755 --- a/contrib/check_file_age.pl +++ b/plugins-scripts/check_file_age.pl @@ -27,7 +27,7 @@ use English; use Getopt::Long; use File::stat; use vars qw($PROGNAME); -use lib utils.pm; +use lib "."; use utils qw (%ERRORS &print_revision &support); sub print_help (); diff --git a/plugins-scripts/subst.in b/plugins-scripts/subst.in index 7e38e02..2ac4534 100644 --- a/plugins-scripts/subst.in +++ b/plugins-scripts/subst.in @@ -45,7 +45,7 @@ BEGIN { /^#! ?\/.*\/sh/ {sub(/^#! ?\/.*\/sh/,"#! @SHELL@");} # add to libexecdir to INC for perl utils.pm -/^use/ { if (/lib/) { if (/utils.pm/ ) {sub(/utils.pm/,led() )} } } +/^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } } # Trusted path mechanism (deprecated) -- 2.30.2