summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xqpid/cpp/etc/qpidd-primary.in2
-rwxr-xr-xqpid/cpp/etc/qpidd.in2
-rwxr-xr-xqpid/cpp/src/check-abi2
-rwxr-xr-xqpid/cpp/src/prof2
-rwxr-xr-xqpid/cpp/src/tests/allhosts2
-rwxr-xr-xqpid/cpp/src/tests/dynamic_log_hires_timestamp2
-rwxr-xr-xqpid/cpp/src/tests/dynamic_log_level_test2
-rwxr-xr-xqpid/cpp/src/tests/fanout_perftest2
-rwxr-xr-xqpid/cpp/src/tests/ipv6_test2
-rw-r--r--qpid/cpp/src/tests/legacystore/clean.sh2
-rwxr-xr-xqpid/cpp/src/tests/legacystore/federation/run_federation_sys_tests2
-rwxr-xr-xqpid/cpp/src/tests/legacystore/federation/run_long_federation_sys_tests2
-rwxr-xr-xqpid/cpp/src/tests/legacystore/jrnl/chk_jdata2
-rwxr-xr-xqpid/cpp/src/tests/legacystore/jrnl/cp_rtest_jrnl2
-rwxr-xr-xqpid/cpp/src/tests/legacystore/jrnl/jhexdump2
-rwxr-xr-xqpid/cpp/src/tests/legacystore/jrnl/prof2
-rwxr-xr-xqpid/cpp/src/tests/legacystore/jrnl/run-journal-tests2
-rw-r--r--qpid/cpp/src/tests/legacystore/run_long_python_tests2
-rwxr-xr-xqpid/cpp/src/tests/legacystore/run_python_tests2
-rw-r--r--qpid/cpp/src/tests/legacystore/run_short_python_tests2
-rw-r--r--qpid/cpp/src/tests/legacystore/system_test.sh2
-rwxr-xr-xqpid/cpp/src/tests/linearstore/linearstoredirsetup.sh2
-rwxr-xr-xqpid/cpp/src/tests/multiq_perftest2
-rwxr-xr-xqpid/cpp/src/tests/perfdist2
-rwxr-xr-xqpid/cpp/src/tests/python_tests2
-rwxr-xr-xqpid/cpp/src/tests/qpid-build-rinstall2
-rwxr-xr-xqpid/cpp/src/tests/qpid-src-rinstall2
-rwxr-xr-xqpid/cpp/src/tests/quick_perftest2
-rwxr-xr-xqpid/cpp/src/tests/quick_topictest2
-rwxr-xr-xqpid/cpp/src/tests/quick_txtest2
-rwxr-xr-xqpid/cpp/src/tests/ring_queue_test2
-rwxr-xr-xqpid/cpp/src/tests/rsynchosts2
-rwxr-xr-xqpid/cpp/src/tests/run_acl_tests2
-rwxr-xr-xqpid/cpp/src/tests/run_cli_tests2
-rwxr-xr-xqpid/cpp/src/tests/run_federation_sys_tests2
-rwxr-xr-xqpid/cpp/src/tests/run_federation_tests2
-rwxr-xr-xqpid/cpp/src/tests/run_ha_tests2
-rwxr-xr-xqpid/cpp/src/tests/run_header_test2
-rwxr-xr-xqpid/cpp/src/tests/run_interlink_tests2
-rw-r--r--qpid/cpp/src/tests/run_long_federation_sys_tests2
-rwxr-xr-xqpid/cpp/src/tests/run_msg_group_tests2
-rwxr-xr-xqpid/cpp/src/tests/run_msg_group_tests_soak2
-rwxr-xr-xqpid/cpp/src/tests/run_paged_queue_tests2
-rwxr-xr-xqpid/cpp/src/tests/run_perftest2
-rwxr-xr-xqpid/cpp/src/tests/run_queue_flow_limit_tests2
-rwxr-xr-xqpid/cpp/src/tests/run_queue_redirect2
-rwxr-xr-xqpid/cpp/src/tests/run_ring_queue_test2
-rwxr-xr-xqpid/cpp/src/tests/run_test2
-rwxr-xr-xqpid/cpp/src/tests/sasl_fed2
-rwxr-xr-xqpid/cpp/src/tests/sasl_fed_ex2
-rwxr-xr-xqpid/cpp/src/tests/sasl_no_dir2
-rwxr-xr-xqpid/cpp/src/tests/sasl_test_setup.sh2
-rwxr-xr-xqpid/cpp/src/tests/shared_perftest2
-rwxr-xr-xqpid/cpp/src/tests/ssl_test2
-rwxr-xr-xqpid/cpp/src/tests/swig_python_tests2
-rw-r--r--qpid/cpp/src/tests/test_env_common.sh2
-rwxr-xr-xqpid/cpp/src/tests/topic_perftest2
-rwxr-xr-xqpid/cpp/src/tests/topictest2
-rwxr-xr-xqpid/java/bdbstore/bin/backup.sh2
-rwxr-xr-xqpid/java/broker/bin/qpid-passwd2
-rwxr-xr-xqpid/java/broker/bin/qpid-server2
-rwxr-xr-xqpid/java/broker/bin/qpid.stop2
-rwxr-xr-xqpid/java/broker/bin/qpid.stopall2
-rw-r--r--qpid/java/broker/scripts/resetAlerting.sh2
-rwxr-xr-xqpid/java/common/bin/qpid-jaddr2
-rwxr-xr-xqpid/java/common/bin/qpid-run2
-rwxr-xr-xqpid/java/perftests/etc/run-perftests.sh2
-rwxr-xr-xqpid/java/perftests/etc/visualisation-timeseries.sh2
-rwxr-xr-xqpid/java/perftests/etc/visualisation.sh2
-rwxr-xr-xqpid/java/perftests/example/run-client.sh2
-rwxr-xr-xqpid/java/perftests/example/run.sh2
-rwxr-xr-xqpid/java/test-profiles/kill-broker2
-rwxr-xr-xqpid/java/test-profiles/start-broker2
-rwxr-xr-xqpid/java/tools/bin/check-qpid-java-env2
-rwxr-xr-xqpid/java/tools/bin/qpid-bench2
-rwxr-xr-xqpid/java/tools/bin/qpid-python-testkit2
-rwxr-xr-xqpid/tools/src/java/bin/ConnectionAudit.sh2
-rwxr-xr-xqpid/tools/src/java/bin/ConnectionLogger.sh2
-rwxr-xr-xqpid/tools/src/java/bin/QpidConfig.sh2
-rwxr-xr-xqpid/tools/src/java/bin/QpidCtrl.sh2
-rwxr-xr-xqpid/tools/src/java/bin/QpidPrintEvents.sh2
-rwxr-xr-xqpid/tools/src/java/bin/QpidQueueStats.sh2
-rwxr-xr-xqpid/tools/src/java/bin/QpidRestAPI.sh2
-rwxr-xr-xqpid/tools/src/java/bin/QueueFuse.sh2
-rwxr-xr-xqpid/tools/src/java/test/bin/AgentExternalTest.sh2
-rwxr-xr-xqpid/tools/src/java/test/bin/AgentSubscriptionTestConsole.sh2
-rwxr-xr-xqpid/tools/src/java/test/bin/AgentTest.sh2
-rwxr-xr-xqpid/tools/src/java/test/bin/AgentTestConsole.sh2
-rwxr-xr-xqpid/tools/src/java/test/bin/BigPayloadAgentTest.sh2
-rwxr-xr-xqpid/tools/src/java/test/bin/BigPayloadAgentTestConsole.sh2
-rwxr-xr-xqpid/tools/src/java/test/bin/BrokerSubscriptionTestConsole.sh2
-rwxr-xr-xqpid/tools/src/java/test/bin/InvokeMethodTest.sh2
-rwxr-xr-xqpid/tools/src/java/test/bin/PartialGetObjectsTest.sh2
-rwxr-xr-xqpid/tools/src/java/test/bin/SchemaTest.sh2
-rwxr-xr-xqpid/tools/src/java/test/bin/Test1.sh2
-rwxr-xr-xqpid/tools/src/java/test/bin/Test2.sh2
-rwxr-xr-xqpid/tools/src/java/test/bin/Test3.sh2
-rwxr-xr-xqpid/tools/src/java/test/bin/Test4.sh2
-rwxr-xr-xqpid/tools/src/java/test/bin/URLTest.sh2
99 files changed, 99 insertions, 99 deletions
diff --git a/qpid/cpp/etc/qpidd-primary.in b/qpid/cpp/etc/qpidd-primary.in
index ebb809dbf6..64537b9b1d 100755
--- a/qpid/cpp/etc/qpidd-primary.in
+++ b/qpid/cpp/etc/qpidd-primary.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/cpp/etc/qpidd.in b/qpid/cpp/etc/qpidd.in
index 91448add02..b8d0e87038 100755
--- a/qpid/cpp/etc/qpidd.in
+++ b/qpid/cpp/etc/qpidd.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/cpp/src/check-abi b/qpid/cpp/src/check-abi
index 2b5d4eda68..55e64e02f5 100755
--- a/qpid/cpp/src/check-abi
+++ b/qpid/cpp/src/check-abi
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
# Ask the compiler the implementation specific type for a standard typedeffed type
# (int64_t, size_t etc.). Operates by test compiling and using the demangling ABI call.
diff --git a/qpid/cpp/src/prof b/qpid/cpp/src/prof
index 6276ff620a..fa470f5f84 100755
--- a/qpid/cpp/src/prof
+++ b/qpid/cpp/src/prof
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/allhosts b/qpid/cpp/src/tests/allhosts
index 09946d8c68..07bc04fff5 100755
--- a/qpid/cpp/src/tests/allhosts
+++ b/qpid/cpp/src/tests/allhosts
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/cpp/src/tests/dynamic_log_hires_timestamp b/qpid/cpp/src/tests/dynamic_log_hires_timestamp
index f312b8ba9b..75034f9902 100755
--- a/qpid/cpp/src/tests/dynamic_log_hires_timestamp
+++ b/qpid/cpp/src/tests/dynamic_log_hires_timestamp
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/dynamic_log_level_test b/qpid/cpp/src/tests/dynamic_log_level_test
index 9a9d6c8724..f8fd7a8dd8 100755
--- a/qpid/cpp/src/tests/dynamic_log_level_test
+++ b/qpid/cpp/src/tests/dynamic_log_level_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/fanout_perftest b/qpid/cpp/src/tests/fanout_perftest
index 99ea5b2ecf..168994d372 100755
--- a/qpid/cpp/src/tests/fanout_perftest
+++ b/qpid/cpp/src/tests/fanout_perftest
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/ipv6_test b/qpid/cpp/src/tests/ipv6_test
index b7244434b2..4ac5f95fba 100755
--- a/qpid/cpp/src/tests/ipv6_test
+++ b/qpid/cpp/src/tests/ipv6_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/legacystore/clean.sh b/qpid/cpp/src/tests/legacystore/clean.sh
index efb19586fa..838f246232 100644
--- a/qpid/cpp/src/tests/legacystore/clean.sh
+++ b/qpid/cpp/src/tests/legacystore/clean.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/legacystore/federation/run_federation_sys_tests b/qpid/cpp/src/tests/legacystore/federation/run_federation_sys_tests
index dff5f12770..776f009c05 100755
--- a/qpid/cpp/src/tests/legacystore/federation/run_federation_sys_tests
+++ b/qpid/cpp/src/tests/legacystore/federation/run_federation_sys_tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/cpp/src/tests/legacystore/federation/run_long_federation_sys_tests b/qpid/cpp/src/tests/legacystore/federation/run_long_federation_sys_tests
index d2b8eec32a..012c8d8f18 100755
--- a/qpid/cpp/src/tests/legacystore/federation/run_long_federation_sys_tests
+++ b/qpid/cpp/src/tests/legacystore/federation/run_long_federation_sys_tests
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/cpp/src/tests/legacystore/jrnl/chk_jdata b/qpid/cpp/src/tests/legacystore/jrnl/chk_jdata
index 67b322af59..2ac87d91b9 100755
--- a/qpid/cpp/src/tests/legacystore/jrnl/chk_jdata
+++ b/qpid/cpp/src/tests/legacystore/jrnl/chk_jdata
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/legacystore/jrnl/cp_rtest_jrnl b/qpid/cpp/src/tests/legacystore/jrnl/cp_rtest_jrnl
index 6d5171ae71..e21f991788 100755
--- a/qpid/cpp/src/tests/legacystore/jrnl/cp_rtest_jrnl
+++ b/qpid/cpp/src/tests/legacystore/jrnl/cp_rtest_jrnl
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/legacystore/jrnl/jhexdump b/qpid/cpp/src/tests/legacystore/jrnl/jhexdump
index 2d4c8a4afb..b013914441 100755
--- a/qpid/cpp/src/tests/legacystore/jrnl/jhexdump
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jhexdump
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/legacystore/jrnl/prof b/qpid/cpp/src/tests/legacystore/jrnl/prof
index 6e0e6da0eb..2abe7baa4a 100755
--- a/qpid/cpp/src/tests/legacystore/jrnl/prof
+++ b/qpid/cpp/src/tests/legacystore/jrnl/prof
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/legacystore/jrnl/run-journal-tests b/qpid/cpp/src/tests/legacystore/jrnl/run-journal-tests
index 5e13967a01..e169e39c60 100755
--- a/qpid/cpp/src/tests/legacystore/jrnl/run-journal-tests
+++ b/qpid/cpp/src/tests/legacystore/jrnl/run-journal-tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/legacystore/run_long_python_tests b/qpid/cpp/src/tests/legacystore/run_long_python_tests
index e43b2236ec..be6380302c 100644
--- a/qpid/cpp/src/tests/legacystore/run_long_python_tests
+++ b/qpid/cpp/src/tests/legacystore/run_long_python_tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/cpp/src/tests/legacystore/run_python_tests b/qpid/cpp/src/tests/legacystore/run_python_tests
index 79dbd35da5..c1d04a28a1 100755
--- a/qpid/cpp/src/tests/legacystore/run_python_tests
+++ b/qpid/cpp/src/tests/legacystore/run_python_tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/cpp/src/tests/legacystore/run_short_python_tests b/qpid/cpp/src/tests/legacystore/run_short_python_tests
index 523924fdba..9b9e7c59be 100644
--- a/qpid/cpp/src/tests/legacystore/run_short_python_tests
+++ b/qpid/cpp/src/tests/legacystore/run_short_python_tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/cpp/src/tests/legacystore/system_test.sh b/qpid/cpp/src/tests/legacystore/system_test.sh
index dbf8902cff..52cecbce8a 100644
--- a/qpid/cpp/src/tests/legacystore/system_test.sh
+++ b/qpid/cpp/src/tests/legacystore/system_test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/linearstore/linearstoredirsetup.sh b/qpid/cpp/src/tests/linearstore/linearstoredirsetup.sh
index b4b8721edd..5e2ca235a1 100755
--- a/qpid/cpp/src/tests/linearstore/linearstoredirsetup.sh
+++ b/qpid/cpp/src/tests/linearstore/linearstoredirsetup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
STORE_DIR=/tmp
LINEARSTOREDIR=~/RedHat/linearstore
diff --git a/qpid/cpp/src/tests/multiq_perftest b/qpid/cpp/src/tests/multiq_perftest
index b8328ac287..9673dd2e6d 100755
--- a/qpid/cpp/src/tests/multiq_perftest
+++ b/qpid/cpp/src/tests/multiq_perftest
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/perfdist b/qpid/cpp/src/tests/perfdist
index 59548b23f7..4049b410ff 100755
--- a/qpid/cpp/src/tests/perfdist
+++ b/qpid/cpp/src/tests/perfdist
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/python_tests b/qpid/cpp/src/tests/python_tests
index 3cdf7725f4..babe93c163 100755
--- a/qpid/cpp/src/tests/python_tests
+++ b/qpid/cpp/src/tests/python_tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/qpid-build-rinstall b/qpid/cpp/src/tests/qpid-build-rinstall
index c2ee957968..beff7dffba 100755
--- a/qpid/cpp/src/tests/qpid-build-rinstall
+++ b/qpid/cpp/src/tests/qpid-build-rinstall
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under onemake
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/cpp/src/tests/qpid-src-rinstall b/qpid/cpp/src/tests/qpid-src-rinstall
index a8dbefffea..c7473e9197 100755
--- a/qpid/cpp/src/tests/qpid-src-rinstall
+++ b/qpid/cpp/src/tests/qpid-src-rinstall
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under onemake
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/cpp/src/tests/quick_perftest b/qpid/cpp/src/tests/quick_perftest
index 9b6f94746c..698af60324 100755
--- a/qpid/cpp/src/tests/quick_perftest
+++ b/qpid/cpp/src/tests/quick_perftest
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/quick_topictest b/qpid/cpp/src/tests/quick_topictest
index e1d5a7d984..e44ec0f477 100755
--- a/qpid/cpp/src/tests/quick_topictest
+++ b/qpid/cpp/src/tests/quick_topictest
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/quick_txtest b/qpid/cpp/src/tests/quick_txtest
index 34ecdcd8eb..77e8556f1d 100755
--- a/qpid/cpp/src/tests/quick_txtest
+++ b/qpid/cpp/src/tests/quick_txtest
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/ring_queue_test b/qpid/cpp/src/tests/ring_queue_test
index 271b46183e..410ea30eb8 100755
--- a/qpid/cpp/src/tests/ring_queue_test
+++ b/qpid/cpp/src/tests/ring_queue_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/rsynchosts b/qpid/cpp/src/tests/rsynchosts
index 81c9699ac3..10e1081f76 100755
--- a/qpid/cpp/src/tests/rsynchosts
+++ b/qpid/cpp/src/tests/rsynchosts
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under onemake
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/cpp/src/tests/run_acl_tests b/qpid/cpp/src/tests/run_acl_tests
index 64aaf7c516..a6f4fd8cbb 100755
--- a/qpid/cpp/src/tests/run_acl_tests
+++ b/qpid/cpp/src/tests/run_acl_tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/run_cli_tests b/qpid/cpp/src/tests/run_cli_tests
index e9590080a1..1db99001a4 100755
--- a/qpid/cpp/src/tests/run_cli_tests
+++ b/qpid/cpp/src/tests/run_cli_tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/run_federation_sys_tests b/qpid/cpp/src/tests/run_federation_sys_tests
index 46f7b3de59..f5f1ae44d3 100755
--- a/qpid/cpp/src/tests/run_federation_sys_tests
+++ b/qpid/cpp/src/tests/run_federation_sys_tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/run_federation_tests b/qpid/cpp/src/tests/run_federation_tests
index bf33f96ebd..8cadd3702f 100755
--- a/qpid/cpp/src/tests/run_federation_tests
+++ b/qpid/cpp/src/tests/run_federation_tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/run_ha_tests b/qpid/cpp/src/tests/run_ha_tests
index 1a469646c9..bb60bea076 100755
--- a/qpid/cpp/src/tests/run_ha_tests
+++ b/qpid/cpp/src/tests/run_ha_tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/run_header_test b/qpid/cpp/src/tests/run_header_test
index a557ee49e9..48529bf7ff 100755
--- a/qpid/cpp/src/tests/run_header_test
+++ b/qpid/cpp/src/tests/run_header_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/run_interlink_tests b/qpid/cpp/src/tests/run_interlink_tests
index 6c61bdd654..71482fa7fd 100755
--- a/qpid/cpp/src/tests/run_interlink_tests
+++ b/qpid/cpp/src/tests/run_interlink_tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/run_long_federation_sys_tests b/qpid/cpp/src/tests/run_long_federation_sys_tests
index 69dc08d11c..c2b4e02d81 100644
--- a/qpid/cpp/src/tests/run_long_federation_sys_tests
+++ b/qpid/cpp/src/tests/run_long_federation_sys_tests
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/run_msg_group_tests b/qpid/cpp/src/tests/run_msg_group_tests
index 4b2332896b..ee479c23c7 100755
--- a/qpid/cpp/src/tests/run_msg_group_tests
+++ b/qpid/cpp/src/tests/run_msg_group_tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/run_msg_group_tests_soak b/qpid/cpp/src/tests/run_msg_group_tests_soak
index 2ebbaf4efd..d87ca16c88 100755
--- a/qpid/cpp/src/tests/run_msg_group_tests_soak
+++ b/qpid/cpp/src/tests/run_msg_group_tests_soak
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/run_paged_queue_tests b/qpid/cpp/src/tests/run_paged_queue_tests
index 1ccefea716..8f72ddd5b7 100755
--- a/qpid/cpp/src/tests/run_paged_queue_tests
+++ b/qpid/cpp/src/tests/run_paged_queue_tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/run_perftest b/qpid/cpp/src/tests/run_perftest
index 5324c2f0c5..2fadc6cc62 100755
--- a/qpid/cpp/src/tests/run_perftest
+++ b/qpid/cpp/src/tests/run_perftest
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/run_queue_flow_limit_tests b/qpid/cpp/src/tests/run_queue_flow_limit_tests
index 6dbc48098e..55b3e5d4c5 100755
--- a/qpid/cpp/src/tests/run_queue_flow_limit_tests
+++ b/qpid/cpp/src/tests/run_queue_flow_limit_tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/run_queue_redirect b/qpid/cpp/src/tests/run_queue_redirect
index c006fea6d7..3a0ae5118a 100755
--- a/qpid/cpp/src/tests/run_queue_redirect
+++ b/qpid/cpp/src/tests/run_queue_redirect
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/run_ring_queue_test b/qpid/cpp/src/tests/run_ring_queue_test
index 7ca870841e..69497f9872 100755
--- a/qpid/cpp/src/tests/run_ring_queue_test
+++ b/qpid/cpp/src/tests/run_ring_queue_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/run_test b/qpid/cpp/src/tests/run_test
index 32dba4b031..6fe49f7975 100755
--- a/qpid/cpp/src/tests/run_test
+++ b/qpid/cpp/src/tests/run_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/cpp/src/tests/sasl_fed b/qpid/cpp/src/tests/sasl_fed
index 48e5b4b40d..38ef43f56f 100755
--- a/qpid/cpp/src/tests/sasl_fed
+++ b/qpid/cpp/src/tests/sasl_fed
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/sasl_fed_ex b/qpid/cpp/src/tests/sasl_fed_ex
index 01791bcf2c..febafb19de 100755
--- a/qpid/cpp/src/tests/sasl_fed_ex
+++ b/qpid/cpp/src/tests/sasl_fed_ex
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/sasl_no_dir b/qpid/cpp/src/tests/sasl_no_dir
index 4d3863fa26..b2f5d1668e 100755
--- a/qpid/cpp/src/tests/sasl_no_dir
+++ b/qpid/cpp/src/tests/sasl_no_dir
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/sasl_test_setup.sh b/qpid/cpp/src/tests/sasl_test_setup.sh
index 28ea97e117..d41efbe6e5 100755
--- a/qpid/cpp/src/tests/sasl_test_setup.sh
+++ b/qpid/cpp/src/tests/sasl_test_setup.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/shared_perftest b/qpid/cpp/src/tests/shared_perftest
index 7a96feb79b..709ffd56b5 100755
--- a/qpid/cpp/src/tests/shared_perftest
+++ b/qpid/cpp/src/tests/shared_perftest
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/ssl_test b/qpid/cpp/src/tests/ssl_test
index da9b073d39..36a8d01b32 100755
--- a/qpid/cpp/src/tests/ssl_test
+++ b/qpid/cpp/src/tests/ssl_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/swig_python_tests b/qpid/cpp/src/tests/swig_python_tests
index 1815372863..6de10f5ae9 100755
--- a/qpid/cpp/src/tests/swig_python_tests
+++ b/qpid/cpp/src/tests/swig_python_tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/test_env_common.sh b/qpid/cpp/src/tests/test_env_common.sh
index 038b6da85c..348664ca76 100644
--- a/qpid/cpp/src/tests/test_env_common.sh
+++ b/qpid/cpp/src/tests/test_env_common.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/cpp/src/tests/topic_perftest b/qpid/cpp/src/tests/topic_perftest
index 6be4bd9aab..04e1cdcffb 100755
--- a/qpid/cpp/src/tests/topic_perftest
+++ b/qpid/cpp/src/tests/topic_perftest
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/cpp/src/tests/topictest b/qpid/cpp/src/tests/topictest
index 257c24bd81..f4c6e7187d 100755
--- a/qpid/cpp/src/tests/topictest
+++ b/qpid/cpp/src/tests/topictest
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/java/bdbstore/bin/backup.sh b/qpid/java/bdbstore/bin/backup.sh
index 71935bac40..ca2233cc8e 100755
--- a/qpid/java/bdbstore/bin/backup.sh
+++ b/qpid/java/bdbstore/bin/backup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/java/broker/bin/qpid-passwd b/qpid/java/broker/bin/qpid-passwd
index cc55c7e2f2..07b7db0cd3 100755
--- a/qpid/java/broker/bin/qpid-passwd
+++ b/qpid/java/broker/bin/qpid-passwd
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server
index a922e0bdba..8d4c56381b 100755
--- a/qpid/java/broker/bin/qpid-server
+++ b/qpid/java/broker/bin/qpid-server
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/java/broker/bin/qpid.stop b/qpid/java/broker/bin/qpid.stop
index 316f8dff46..867f9788e2 100755
--- a/qpid/java/broker/bin/qpid.stop
+++ b/qpid/java/broker/bin/qpid.stop
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/java/broker/bin/qpid.stopall b/qpid/java/broker/bin/qpid.stopall
index b0ad506629..4ab2df3b4b 100755
--- a/qpid/java/broker/bin/qpid.stopall
+++ b/qpid/java/broker/bin/qpid.stopall
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/java/broker/scripts/resetAlerting.sh b/qpid/java/broker/scripts/resetAlerting.sh
index 18e8c64cb0..ebbdc168d2 100644
--- a/qpid/java/broker/scripts/resetAlerting.sh
+++ b/qpid/java/broker/scripts/resetAlerting.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/java/common/bin/qpid-jaddr b/qpid/java/common/bin/qpid-jaddr
index 269a5379a0..5c8efa069d 100755
--- a/qpid/java/common/bin/qpid-jaddr
+++ b/qpid/java/common/bin/qpid-jaddr
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/java/common/bin/qpid-run b/qpid/java/common/bin/qpid-run
index a10766b37a..7e8d4c92c5 100755
--- a/qpid/java/common/bin/qpid-run
+++ b/qpid/java/common/bin/qpid-run
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/java/perftests/etc/run-perftests.sh b/qpid/java/perftests/etc/run-perftests.sh
index a784623791..de435ecfca 100755
--- a/qpid/java/perftests/etc/run-perftests.sh
+++ b/qpid/java/perftests/etc/run-perftests.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/java/perftests/etc/visualisation-timeseries.sh b/qpid/java/perftests/etc/visualisation-timeseries.sh
index 32db2cb010..3f35b9047c 100755
--- a/qpid/java/perftests/etc/visualisation-timeseries.sh
+++ b/qpid/java/perftests/etc/visualisation-timeseries.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/java/perftests/etc/visualisation.sh b/qpid/java/perftests/etc/visualisation.sh
index 282fb3d3e7..4c10d7e2e2 100755
--- a/qpid/java/perftests/etc/visualisation.sh
+++ b/qpid/java/perftests/etc/visualisation.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/java/perftests/example/run-client.sh b/qpid/java/perftests/example/run-client.sh
index ad158529b6..18679a5d08 100755
--- a/qpid/java/perftests/example/run-client.sh
+++ b/qpid/java/perftests/example/run-client.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/java/perftests/example/run.sh b/qpid/java/perftests/example/run.sh
index 31124a060a..0f15f570bb 100755
--- a/qpid/java/perftests/example/run.sh
+++ b/qpid/java/perftests/example/run.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/java/test-profiles/kill-broker b/qpid/java/test-profiles/kill-broker
index 8078fa755e..ed62e0f1c6 100755
--- a/qpid/java/test-profiles/kill-broker
+++ b/qpid/java/test-profiles/kill-broker
@@ -1,5 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/java/test-profiles/start-broker b/qpid/java/test-profiles/start-broker
index e0bbb89d87..c5c477e999 100755
--- a/qpid/java/test-profiles/start-broker
+++ b/qpid/java/test-profiles/start-broker
@@ -1,5 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/qpid/java/tools/bin/check-qpid-java-env b/qpid/java/tools/bin/check-qpid-java-env
index dedd6e06ea..da67e50a90 100755
--- a/qpid/java/tools/bin/check-qpid-java-env
+++ b/qpid/java/tools/bin/check-qpid-java-env
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/java/tools/bin/qpid-bench b/qpid/java/tools/bin/qpid-bench
index cd894b607f..4773320b9e 100755
--- a/qpid/java/tools/bin/qpid-bench
+++ b/qpid/java/tools/bin/qpid-bench
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/java/tools/bin/qpid-python-testkit b/qpid/java/tools/bin/qpid-python-testkit
index 7233d0d075..20f72aca53 100755
--- a/qpid/java/tools/bin/qpid-python-testkit
+++ b/qpid/java/tools/bin/qpid-python-testkit
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/bin/ConnectionAudit.sh b/qpid/tools/src/java/bin/ConnectionAudit.sh
index 303c61cbc6..b2f494c025 100755
--- a/qpid/tools/src/java/bin/ConnectionAudit.sh
+++ b/qpid/tools/src/java/bin/ConnectionAudit.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/bin/ConnectionLogger.sh b/qpid/tools/src/java/bin/ConnectionLogger.sh
index 77ae9ee334..da4474d48e 100755
--- a/qpid/tools/src/java/bin/ConnectionLogger.sh
+++ b/qpid/tools/src/java/bin/ConnectionLogger.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/bin/QpidConfig.sh b/qpid/tools/src/java/bin/QpidConfig.sh
index 9f191d3d3d..16177aed24 100755
--- a/qpid/tools/src/java/bin/QpidConfig.sh
+++ b/qpid/tools/src/java/bin/QpidConfig.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/bin/QpidCtrl.sh b/qpid/tools/src/java/bin/QpidCtrl.sh
index 8b10338c7b..e0086fb0cf 100755
--- a/qpid/tools/src/java/bin/QpidCtrl.sh
+++ b/qpid/tools/src/java/bin/QpidCtrl.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/bin/QpidPrintEvents.sh b/qpid/tools/src/java/bin/QpidPrintEvents.sh
index 1e8d03093b..c8f17e2906 100755
--- a/qpid/tools/src/java/bin/QpidPrintEvents.sh
+++ b/qpid/tools/src/java/bin/QpidPrintEvents.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/bin/QpidQueueStats.sh b/qpid/tools/src/java/bin/QpidQueueStats.sh
index 7685562e3b..a233d0ba49 100755
--- a/qpid/tools/src/java/bin/QpidQueueStats.sh
+++ b/qpid/tools/src/java/bin/QpidQueueStats.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/bin/QpidRestAPI.sh b/qpid/tools/src/java/bin/QpidRestAPI.sh
index 143e2ffde7..e9cca15204 100755
--- a/qpid/tools/src/java/bin/QpidRestAPI.sh
+++ b/qpid/tools/src/java/bin/QpidRestAPI.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/bin/QueueFuse.sh b/qpid/tools/src/java/bin/QueueFuse.sh
index 8f04650b72..4e51731412 100755
--- a/qpid/tools/src/java/bin/QueueFuse.sh
+++ b/qpid/tools/src/java/bin/QueueFuse.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/test/bin/AgentExternalTest.sh b/qpid/tools/src/java/test/bin/AgentExternalTest.sh
index 566e291b91..de7778c9fe 100755
--- a/qpid/tools/src/java/test/bin/AgentExternalTest.sh
+++ b/qpid/tools/src/java/test/bin/AgentExternalTest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/test/bin/AgentSubscriptionTestConsole.sh b/qpid/tools/src/java/test/bin/AgentSubscriptionTestConsole.sh
index eedeb6a9ea..e86860bfea 100755
--- a/qpid/tools/src/java/test/bin/AgentSubscriptionTestConsole.sh
+++ b/qpid/tools/src/java/test/bin/AgentSubscriptionTestConsole.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/test/bin/AgentTest.sh b/qpid/tools/src/java/test/bin/AgentTest.sh
index 7418caa534..9a0038e073 100755
--- a/qpid/tools/src/java/test/bin/AgentTest.sh
+++ b/qpid/tools/src/java/test/bin/AgentTest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/test/bin/AgentTestConsole.sh b/qpid/tools/src/java/test/bin/AgentTestConsole.sh
index ecd6f9ebf1..d5e958e385 100755
--- a/qpid/tools/src/java/test/bin/AgentTestConsole.sh
+++ b/qpid/tools/src/java/test/bin/AgentTestConsole.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/test/bin/BigPayloadAgentTest.sh b/qpid/tools/src/java/test/bin/BigPayloadAgentTest.sh
index 049416678c..e97d99c37a 100755
--- a/qpid/tools/src/java/test/bin/BigPayloadAgentTest.sh
+++ b/qpid/tools/src/java/test/bin/BigPayloadAgentTest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/test/bin/BigPayloadAgentTestConsole.sh b/qpid/tools/src/java/test/bin/BigPayloadAgentTestConsole.sh
index bdf2b9d517..92ad26966f 100755
--- a/qpid/tools/src/java/test/bin/BigPayloadAgentTestConsole.sh
+++ b/qpid/tools/src/java/test/bin/BigPayloadAgentTestConsole.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/test/bin/BrokerSubscriptionTestConsole.sh b/qpid/tools/src/java/test/bin/BrokerSubscriptionTestConsole.sh
index 6fd2aae0e8..9db81c1ccd 100755
--- a/qpid/tools/src/java/test/bin/BrokerSubscriptionTestConsole.sh
+++ b/qpid/tools/src/java/test/bin/BrokerSubscriptionTestConsole.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/test/bin/InvokeMethodTest.sh b/qpid/tools/src/java/test/bin/InvokeMethodTest.sh
index 7f4cc82362..520cf8361d 100755
--- a/qpid/tools/src/java/test/bin/InvokeMethodTest.sh
+++ b/qpid/tools/src/java/test/bin/InvokeMethodTest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/test/bin/PartialGetObjectsTest.sh b/qpid/tools/src/java/test/bin/PartialGetObjectsTest.sh
index cdc76bcd8d..6a5b4c9ef8 100755
--- a/qpid/tools/src/java/test/bin/PartialGetObjectsTest.sh
+++ b/qpid/tools/src/java/test/bin/PartialGetObjectsTest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/test/bin/SchemaTest.sh b/qpid/tools/src/java/test/bin/SchemaTest.sh
index 6e24896d2c..2ce33a08ca 100755
--- a/qpid/tools/src/java/test/bin/SchemaTest.sh
+++ b/qpid/tools/src/java/test/bin/SchemaTest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/test/bin/Test1.sh b/qpid/tools/src/java/test/bin/Test1.sh
index d48cf2e501..13bf0ae880 100755
--- a/qpid/tools/src/java/test/bin/Test1.sh
+++ b/qpid/tools/src/java/test/bin/Test1.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/test/bin/Test2.sh b/qpid/tools/src/java/test/bin/Test2.sh
index be2d903a8f..877655b3d4 100755
--- a/qpid/tools/src/java/test/bin/Test2.sh
+++ b/qpid/tools/src/java/test/bin/Test2.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/test/bin/Test3.sh b/qpid/tools/src/java/test/bin/Test3.sh
index e5af741b47..5e0e88ecc6 100755
--- a/qpid/tools/src/java/test/bin/Test3.sh
+++ b/qpid/tools/src/java/test/bin/Test3.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/test/bin/Test4.sh b/qpid/tools/src/java/test/bin/Test4.sh
index 97025bfedf..ff694e24fa 100755
--- a/qpid/tools/src/java/test/bin/Test4.sh
+++ b/qpid/tools/src/java/test/bin/Test4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/qpid/tools/src/java/test/bin/URLTest.sh b/qpid/tools/src/java/test/bin/URLTest.sh
index 10dde796b7..aac91eea53 100755
--- a/qpid/tools/src/java/test/bin/URLTest.sh
+++ b/qpid/tools/src/java/test/bin/URLTest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file