summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@verizonmedia.com>2020-01-17 12:09:57 +0100
committerTor Egge <Tor.Egge@verizonmedia.com>2020-01-17 12:09:57 +0100
commitb3e72623dce8af9a609fc34786732ba3dfaafcbf (patch)
tree1cfc37600a628ee05588fd6b2a5b0ea81c8e0d82 /config-model
parentb324c19e007a7a57ba731ed72a01d35cd6937ed7 (diff)
Enable vespa site perl in bootstrap section of perl scripts.
Diffstat (limited to 'config-model')
-rwxr-xr-xconfig-model/src/main/perl/vespa-deploy6
1 files changed, 3 insertions, 3 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();