From 4503c40245fab0105322110874d01fe379a6b274 Mon Sep 17 00:00:00 2001
From: Arne Juul <arnej@yahoo-inc.com>
Date: Mon, 14 May 2018 14:43:04 +0000
Subject: update perl bootstrap

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

(limited to 'vespaclient/src/perl')

diff --git a/vespaclient/src/perl/bin/GetClusterState.pl b/vespaclient/src/perl/bin/GetClusterState.pl
index e3528fff039..155db87f34e 100755
--- a/vespaclient/src/perl/bin/GetClusterState.pl
+++ b/vespaclient/src/perl/bin/GetClusterState.pl
@@ -57,9 +57,11 @@ sub findhost {
     my $tmp = $ENV{'VESPA_HOSTNAME'};
     if (!defined $tmp) {
         $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+        chomp $tmp;
     }
     system("vespa-validate-hostname $tmp");
     ( $? == 0 ) or die "Could not validate hostname\n";
+    return $tmp;
 }
 
 BEGIN {
diff --git a/vespaclient/src/perl/bin/GetNodeState.pl b/vespaclient/src/perl/bin/GetNodeState.pl
index 28f3cf99b1f..1e048df4b40 100755
--- a/vespaclient/src/perl/bin/GetNodeState.pl
+++ b/vespaclient/src/perl/bin/GetNodeState.pl
@@ -57,9 +57,11 @@ sub findhost {
     my $tmp = $ENV{'VESPA_HOSTNAME'};
     if (!defined $tmp) {
         $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+        chomp $tmp;
     }
     system("vespa-validate-hostname $tmp");
     ( $? == 0 ) or die "Could not validate hostname\n";
+    return $tmp;
 }
 
 BEGIN {
diff --git a/vespaclient/src/perl/bin/SetNodeState.pl b/vespaclient/src/perl/bin/SetNodeState.pl
index 91ceeea2c1b..77ebf9a2456 100755
--- a/vespaclient/src/perl/bin/SetNodeState.pl
+++ b/vespaclient/src/perl/bin/SetNodeState.pl
@@ -57,9 +57,11 @@ sub findhost {
     my $tmp = $ENV{'VESPA_HOSTNAME'};
     if (!defined $tmp) {
         $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+        chomp $tmp;
     }
     system("vespa-validate-hostname $tmp");
     ( $? == 0 ) or die "Could not validate hostname\n";
+    return $tmp;
 }
 
 BEGIN {
-- 
cgit v1.2.3