diff options
author | Arnstein Ressem <aressem@verizonmedia.com> | 2022-09-01 13:24:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-01 13:24:34 +0200 |
commit | 6bfc32c905dce1c641b5ed4c14de1865a9bf549d (patch) | |
tree | b6114c11e3f227300a3f37d1ba61f174700f3a2d | |
parent | 4cc20245454156264d2481f563a800542559469d (diff) | |
parent | e6e9805edcdfd7176a32f35cb8df04b25dbcb03c (diff) |
Merge pull request #23887 from vespa-engine/arnej/less-perl-snippets-2
Reapply "replace two perl snippets with calls to script-utils"
-rwxr-xr-x | vespabase/src/common-env.sh | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index afed1595a19..628ebe6b074 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -35,26 +35,7 @@ consider_fallback () { read_conf_file () { deffile="$VESPA_HOME/conf/vespa/default-env.txt" if [ -f "${deffile}" ]; then - eval $(perl -ne ' - chomp; - my ($action, $varname, $value) = split(" ", $_, 3); - $varname =~ s{[.]}{__}g; - if ($varname !~ m{^\w+}) { - # print STDERR "invalid var name $varname" - next; - } - if ($action eq "fallback" || $action eq "override") { - next if ($action eq "fallback" && $ENV{$varname} ne ""); - # quote value - if ($value !~ m{^["][^"]*["]$} ) { - $value =~ s{(\W)}{\\$1}g; - } - print "$varname=$value; export $varname; " - } - if ($action eq "unset") { - print "export -n $varname; unset $varname; " - } - ' < $deffile) + eval $(${VESPA_HOME}/libexec/vespa/script-utils export-env) fi } @@ -329,8 +310,7 @@ use_configserver_if_needed () { } getJavaOptionsIPV46() { - canon_ipv4=$(hostname | perl -pe 'chomp; ($_,$rest) = gethostbyname($_);') - if [ -z "${canon_ipv4}" ]; then + if ${VESPA_HOME}/libexec/vespa/script-utils ipv6-only; then echo " -Djava.net.preferIPv6Addresses=true" fi } |