From 1a94376c19fda2073a0e8c2ce3ea34cf58367f2c Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Tue, 9 Jul 2019 18:42:19 -0700 Subject: [PATCH] restore ModuleDirs in caPerlApp --- modules/ca/src/template/top/caPerlApp/caget.pl | 3 ++- modules/ca/src/template/top/caPerlApp/cainfo.pl | 3 ++- modules/ca/src/template/top/caPerlApp/camonitor.pl | 3 ++- modules/ca/src/template/top/caPerlApp/caput.pl | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/ca/src/template/top/caPerlApp/caget.pl b/modules/ca/src/template/top/caPerlApp/caget.pl index d206d8a36..0d9af37a1 100644 --- a/modules/ca/src/template/top/caPerlApp/caget.pl +++ b/modules/ca/src/template/top/caPerlApp/caget.pl @@ -4,8 +4,9 @@ use strict; # This construct sets @INC to search lib/perl of all RELEASE entries use FindBin qw($Bin); -use lib ("$Bin/../../lib/perl"); +use lib ($Bin, "$Bin/../../lib/perl"); use _APPNAME_ModuleDirs; +no lib $Bin; use Getopt::Std; use Scalar::Util qw(looks_like_number); diff --git a/modules/ca/src/template/top/caPerlApp/cainfo.pl b/modules/ca/src/template/top/caPerlApp/cainfo.pl index 4d4a1ffbe..3e38e8baf 100644 --- a/modules/ca/src/template/top/caPerlApp/cainfo.pl +++ b/modules/ca/src/template/top/caPerlApp/cainfo.pl @@ -4,8 +4,9 @@ use strict; # This construct sets @INC to search lib/perl of all RELEASE entries use FindBin qw($Bin); -use lib ("$Bin/../../lib/perl"); +use lib ($Bin, "$Bin/../../lib/perl"); use _APPNAME_ModuleDirs; +no lib $Bin; use Getopt::Std; use CA; diff --git a/modules/ca/src/template/top/caPerlApp/camonitor.pl b/modules/ca/src/template/top/caPerlApp/camonitor.pl index c426fa536..564688d68 100644 --- a/modules/ca/src/template/top/caPerlApp/camonitor.pl +++ b/modules/ca/src/template/top/caPerlApp/camonitor.pl @@ -4,8 +4,9 @@ use strict; # This construct sets @INC to search lib/perl of all RELEASE entries use FindBin qw($Bin); -use lib ("$Bin/../../lib/perl"); +use lib ($Bin, "$Bin/../../lib/perl"); use _APPNAME_ModuleDirs; +no lib $Bin; use Getopt::Std; use Scalar::Util qw(looks_like_number); diff --git a/modules/ca/src/template/top/caPerlApp/caput.pl b/modules/ca/src/template/top/caPerlApp/caput.pl index 03842d397..64ff9cbda 100644 --- a/modules/ca/src/template/top/caPerlApp/caput.pl +++ b/modules/ca/src/template/top/caPerlApp/caput.pl @@ -4,8 +4,9 @@ use strict; # This construct sets @INC to search lib/perl of all RELEASE entries use FindBin qw($Bin); -use lib ("$Bin/../../lib/perl"); +use lib ($Bin, "$Bin/../../lib/perl"); use _APPNAME_ModuleDirs; +no lib $Bin; use Getopt::Std; use CA;