From b3e72623dce8af9a609fc34786732ba3dfaafcbf Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@verizonmedia.com>
Date: Fri, 17 Jan 2020 12:09:57 +0100
Subject: Enable vespa site perl in bootstrap section of perl scripts.

---
 vespaclient/src/perl/bin/GetClusterState.pl | 6 +++---
 vespaclient/src/perl/bin/GetNodeState.pl    | 6 +++---
 vespaclient/src/perl/bin/SetNodeState.pl    | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'vespaclient')

diff --git a/vespaclient/src/perl/bin/GetClusterState.pl b/vespaclient/src/perl/bin/GetClusterState.pl
index aee988c74ff..a60433cc391 100755
--- a/vespaclient/src/perl/bin/GetClusterState.pl
+++ b/vespaclient/src/perl/bin/GetClusterState.pl
@@ -39,7 +39,7 @@ sub findhome {
     }
 
     # Try the ROOT env variable
-    $ROOT = $ENV{'ROOT'};
+    my $ROOT = $ENV{'ROOT'};
     return $ROOT if is_vespa_home($ROOT);
 
     # Try the script location or current dir
@@ -75,10 +75,10 @@ BEGIN {
 }
 my $VESPA_HOME = $ENV{'VESPA_HOME'};
 
+use lib $VESPA_HOME . "/lib/perl5/site_perl";
+
 # END perl environment bootstrap section
 
-use lib $ENV{'VESPA_HOME'} . '/lib/perl5/site_perl';
-use lib $ENV{'VESPA_HOME'} . '/lib64/perl5/site_perl';
 use Yahoo::Vespa::Defaults;
 readConfFile();
 
diff --git a/vespaclient/src/perl/bin/GetNodeState.pl b/vespaclient/src/perl/bin/GetNodeState.pl
index c303b94be90..7b44275ce72 100755
--- a/vespaclient/src/perl/bin/GetNodeState.pl
+++ b/vespaclient/src/perl/bin/GetNodeState.pl
@@ -39,7 +39,7 @@ sub findhome {
     }
 
     # Try the ROOT env variable
-    $ROOT = $ENV{'ROOT'};
+    my $ROOT = $ENV{'ROOT'};
     return $ROOT if is_vespa_home($ROOT);
 
     # Try the script location or current dir
@@ -75,10 +75,10 @@ BEGIN {
 }
 my $VESPA_HOME = $ENV{'VESPA_HOME'};
 
+use lib $VESPA_HOME . "/lib/perl5/site_perl";
+
 # END perl environment bootstrap section
 
-use lib $ENV{'VESPA_HOME'} . '/lib/perl5/site_perl';
-use lib $ENV{'VESPA_HOME'} . '/lib64/perl5/site_perl';
 use Yahoo::Vespa::Defaults;
 readConfFile();
 
diff --git a/vespaclient/src/perl/bin/SetNodeState.pl b/vespaclient/src/perl/bin/SetNodeState.pl
index b1fc32c02b3..29e0bc161c0 100755
--- a/vespaclient/src/perl/bin/SetNodeState.pl
+++ b/vespaclient/src/perl/bin/SetNodeState.pl
@@ -39,7 +39,7 @@ sub findhome {
     }
 
     # Try the ROOT env variable
-    $ROOT = $ENV{'ROOT'};
+    my $ROOT = $ENV{'ROOT'};
     return $ROOT if is_vespa_home($ROOT);
 
     # Try the script location or current dir
@@ -75,10 +75,10 @@ BEGIN {
 }
 my $VESPA_HOME = $ENV{'VESPA_HOME'};
 
+use lib $VESPA_HOME . "/lib/perl5/site_perl";
+
 # END perl environment bootstrap section
 
-use lib $ENV{'VESPA_HOME'} . '/lib/perl5/site_perl';
-use lib $ENV{'VESPA_HOME'} . '/lib64/perl5/site_perl';
 use Yahoo::Vespa::Defaults;
 readConfFile();
 
-- 
cgit v1.2.3