diff options
| author | Tor Egge <Tor.Egge@verizonmedia.com> | 2020-01-17 12:09:57 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@verizonmedia.com> | 2020-01-17 12:09:57 +0100 |
| commit | b3e72623dce8af9a609fc34786732ba3dfaafcbf (patch) | |
| tree | 1cfc37600a628ee05588fd6b2a5b0ea81c8e0d82 | |
| parent | b324c19e007a7a57ba731ed72a01d35cd6937ed7 (diff) | |
Enable vespa site perl in bootstrap section of perl scripts.
| -rwxr-xr-x | config-model/src/main/perl/vespa-deploy | 6 | ||||
| -rwxr-xr-x | config/src/apps/vespa-config/vespa-config.pl | 6 | ||||
| -rwxr-xr-x | vespaclient/src/perl/bin/GetClusterState.pl | 6 | ||||
| -rwxr-xr-x | vespaclient/src/perl/bin/GetNodeState.pl | 6 | ||||
| -rwxr-xr-x | vespaclient/src/perl/bin/SetNodeState.pl | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/config-model/src/main/perl/vespa-deploy b/config-model/src/main/perl/vespa-deploy index 3519d5ace58..c4da8cccd7c 100755 --- a/config-model/src/main/perl/vespa-deploy +++ b/config-model/src/main/perl/vespa-deploy @@ -41,7 +41,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 @@ -77,10 +77,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/config/src/apps/vespa-config/vespa-config.pl b/config/src/apps/vespa-config/vespa-config.pl index 6c0eb241959..813d71f433c 100755 --- a/config/src/apps/vespa-config/vespa-config.pl +++ b/config/src/apps/vespa-config/vespa-config.pl @@ -41,7 +41,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 @@ -77,10 +77,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/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(); |