Use /usr/bin/env perl instead of /usr/local/bin/perl

16 files changed, 28 insertions, 22 deletions

diff --git a/config-model/src/main/perl/deploy b/config-model/src/main/perl/deploy
index 00e3b0d91f8..d6500a7946a 100755
--- a/config-model/src/main/perl/deploy
+++ b/config-model/src/main/perl/deploy
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/env perl
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 # This script is for uploading, preparing, activating and fetching
 # application packages to a cloud config server
@@ -6,6 +6,7 @@
 # BEGIN perl environment bootstrap section
 # Do not edit between here and END as this section should stay identical in all scripts
 
+use warnings;
 use File::Basename;
 use File::Path;
 
diff --git a/config-model/src/main/perl/expand-config.pl b/config-model/src/main/perl/expand-config.pl
index 643de484620..198dc9f3447 100755
--- a/config-model/src/main/perl/expand-config.pl
+++ b/config-model/src/main/perl/expand-config.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #============================================================================
diff --git a/config-model/src/main/perl/vespa-replicate-log-stream b/config-model/src/main/perl/vespa-replicate-log-stream
index 3e02b498554..24081975e9b 100755
--- a/config-model/src/main/perl/vespa-replicate-log-stream
+++ b/config-model/src/main/perl/vespa-replicate-log-stream
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 
 use IO::Socket::INET;
 
diff --git a/config/src/apps/vespa-config/vespa-config.pl b/config/src/apps/vespa-config/vespa-config.pl
index a87e5e52976..a558a6dcbc4 100755
--- a/config/src/apps/vespa-config/vespa-config.pl
+++ b/config/src/apps/vespa-config/vespa-config.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/env perl
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #
 # Various small functions used when bootstrapping the config system
@@ -6,6 +6,7 @@
 # BEGIN perl environment bootstrap section
 # Do not edit between here and END as this section should stay identical in all scripts
 
+use warnings;
 use File::Basename;
 use File::Path;
 
diff --git a/configgen/bin/make-config.pl b/configgen/bin/make-config.pl
index 4629e6e3240..310688352a2 100755
--- a/configgen/bin/make-config.pl
+++ b/configgen/bin/make-config.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #
 # This script transforms a .def file into a .h and .cpp file for config
diff --git a/configgen/bin/make-configold.pl b/configgen/bin/make-configold.pl
index 5ba2d88f67e..d974df7b867 100755
--- a/configgen/bin/make-configold.pl
+++ b/configgen/bin/make-configold.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #
 # This script transforms a .def file into a .h and .cpp file for config
diff --git a/configserver/CMakeLists.txt b/configserver/CMakeLists.txt
index ce72c16b493..90d92c7c03e 100644
--- a/configserver/CMakeLists.txt
+++ b/configserver/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_install_script(src/main/sh/cloudconfig_server-remove-state bin)
-vespa_install_script(src/main/sh/start-filedistribution start-file libexec)
-vespa_install_script(src/main/sh/ping-configserver libexec)
-vespa_install_script(src/main/sh/start-configserver libexec)
-vespa_install_script(src/main/sh/start-logd libexec)
-vespa_install_script(src/main/sh/stop-configserver libexec)
+vespa_install_script(src/main/sh/start-filedistribution start-file libexec/vespa)
+vespa_install_script(src/main/sh/ping-configserver libexec/vespa)
+vespa_install_script(src/main/sh/start-configserver libexec/vespa)
+vespa_install_script(src/main/sh/start-logd libexec/vespa)
+vespa_install_script(src/main/sh/stop-configserver libexec/vespa)
diff --git a/jdisc_akamai/src/main/perl/jdisc_akamai_conf.pl b/jdisc_akamai/src/main/perl/jdisc_akamai_conf.pl
index 13a0db27552..5a93948fdcd 100644..100755
--- a/jdisc_akamai/src/main/perl/jdisc_akamai_conf.pl
+++ b/jdisc_akamai/src/main/perl/jdisc_akamai_conf.pl
@@ -1,9 +1,10 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/env perl
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 # BEGIN perl environment bootstrap section
 # Do not edit between here and END as this section should stay identical in all scripts
 
+use warnings;
 use File::Basename;
 use File::Path;
 
diff --git a/jdisc_core/src/main/perl/jdisc_logfmt b/jdisc_core/src/main/perl/jdisc_logfmt
index 1a05e229832..11a21cbe01a 100755
--- a/jdisc_core/src/main/perl/jdisc_logfmt
+++ b/jdisc_core/src/main/perl/jdisc_logfmt
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 # BEGIN perl environment bootstrap section
diff --git a/jdisc_core/src/test/perl/jdisc_logfmt_test.sh b/jdisc_core/src/test/perl/jdisc_logfmt_test.sh
index bb7e92ed8cf..0166d33d8ab 100755
--- a/jdisc_core/src/test/perl/jdisc_logfmt_test.sh
+++ b/jdisc_core/src/test/perl/jdisc_logfmt_test.sh
@@ -4,10 +4,10 @@ MYPATH=`dirname ${0}`
 DIFF=/usr/bin/diff
 LOGFMT=${1}
 
-if [ -e "/usr/local/bin/perl" ]; then
+if which perl &> /dev/null; then
     echo "Running jdisc_logfmt test suite."
 else
-    echo "Ignoring jdisc_logfmt test suite as there is no /usr/local/bin/perl"
+    echo "Ignoring jdisc_logfmt test suite as there is no perl executable."
     exit 0
 fi
 
diff --git a/jdisc_status/src/main/perl/jdisc_status_conf.pl b/jdisc_status/src/main/perl/jdisc_status_conf.pl
index 3e02f42c46d..5fb35f92258 100644..100755
--- a/jdisc_status/src/main/perl/jdisc_status_conf.pl
+++ b/jdisc_status/src/main/perl/jdisc_status_conf.pl
@@ -1,9 +1,10 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/env perl
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 # BEGIN perl environment bootstrap section
 # Do not edit between here and END as this section should stay identical in all scripts
 
+use warnings;
 use File::Basename;
 use File::Path;
 
diff --git a/vespaclient/src/perl/bin/GetClusterState.pl b/vespaclient/src/perl/bin/GetClusterState.pl
index 2352a5a0ca6..23c2d350d4c 100755
--- a/vespaclient/src/perl/bin/GetClusterState.pl
+++ b/vespaclient/src/perl/bin/GetClusterState.pl
@@ -1,9 +1,10 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/env perl
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 # BEGIN perl environment bootstrap section
 # Do not edit between here and END as this section should stay identical in all scripts
 
+use warnings;
 use File::Basename;
 use File::Path;
 
diff --git a/vespaclient/src/perl/bin/GetNodeState.pl b/vespaclient/src/perl/bin/GetNodeState.pl
index d373eadb65b..ca394305e5f 100755
--- a/vespaclient/src/perl/bin/GetNodeState.pl
+++ b/vespaclient/src/perl/bin/GetNodeState.pl
@@ -1,9 +1,10 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/env perl
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 # BEGIN perl environment bootstrap section
 # Do not edit between here and END as this section should stay identical in all scripts
 
+use warnings;
 use File::Basename;
 use File::Path;
 
diff --git a/vespaclient/src/perl/bin/SetNodeState.pl b/vespaclient/src/perl/bin/SetNodeState.pl
index 7002ab523b5..3933cb409e6 100755
--- a/vespaclient/src/perl/bin/SetNodeState.pl
+++ b/vespaclient/src/perl/bin/SetNodeState.pl
@@ -1,9 +1,10 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/env perl
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 # BEGIN perl environment bootstrap section
 # Do not edit between here and END as this section should stay identical in all scripts
 
+use warnings;
 use File::Basename;
 use File::Path;
 
diff --git a/vespalib/src/tests/text/lowercase/to-c-code.pl b/vespalib/src/tests/text/lowercase/to-c-code.pl
index 63a87fb56ae..8fa00992e29 100755
--- a/vespalib/src/tests/text/lowercase/to-c-code.pl
+++ b/vespalib/src/tests/text/lowercase/to-c-code.pl
@@ -1,10 +1,9 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 # input looks like:
 # lowercase( 65 )= 97
 
-
 my %lowercase;
 
 my %blocks;
diff --git a/vespalog/src/logfmt/logfmt.pl b/vespalog/src/logfmt/logfmt.pl
index 9152d1fcfec..8d01feb3a6b 100644..100755
--- a/vespalog/src/logfmt/logfmt.pl
+++ b/vespalog/src/logfmt/logfmt.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 # BEGIN perl environment bootstrap section