From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Fri, 13 Dec 2013 11:26:17 +0000 (+0100)
Subject: make our bash invocations more portable
X-Git-Tag: rec-3.6.0-rc1~296
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf4d037d4f5cca8b3386f53544247284f51ae5c2;p=pdns

make our bash invocations more portable
---

diff --git a/build-scripts/set-version-auth b/build-scripts/set-version-auth
index 41800fc46..e21e2ae04 100755
--- a/build-scripts/set-version-auth
+++ b/build-scripts/set-version-auth
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 VERSION=$1
 DEB_VERSION=$2
 RPM_VERSION=$3
diff --git a/build-scripts/set-version-recursor b/build-scripts/set-version-recursor
index 91be4b78e..36cb744d4 100755
--- a/build-scripts/set-version-recursor
+++ b/build-scripts/set-version-recursor
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 VERSION=$1
 DEB_VERSION=$2
 RPM_VERSION=$3
diff --git a/pdns/dnssec-scripts/clone-zone b/pdns/dnssec-scripts/clone-zone
index 6acf5406f..db95e0d4e 100755
--- a/pdns/dnssec-scripts/clone-zone
+++ b/pdns/dnssec-scripts/clone-zone
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 TIMERANGE=$(drill -D @127.0.0.1 -p 5300 powerdnssec.org -t soa | grep RRSIG | head -1 | 
 	awk '{printf "-e %s -i %s", $9, $10}')
diff --git a/pdns/dnssec-scripts/gencmpquestions b/pdns/dnssec-scripts/gencmpquestions
index aaae2f46d..3d4dd367a 100755
--- a/pdns/dnssec-scripts/gencmpquestions
+++ b/pdns/dnssec-scripts/gencmpquestions
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 PDNSPORT=5300
 CMPPORT=53
 
diff --git a/pdns/dnssec-scripts/gendiff b/pdns/dnssec-scripts/gendiff
index 8fab684f4..3089c4caf 100755
--- a/pdns/dnssec-scripts/gendiff
+++ b/pdns/dnssec-scripts/gendiff
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 for a in output.*.pdns
 do 
diff --git a/pdns/tools/rrd/makegraphs b/pdns/tools/rrd/makegraphs
index 27f0a87fb..a0f66998c 100755
--- a/pdns/tools/rrd/makegraphs
+++ b/pdns/tools/rrd/makegraphs
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 WWWPREFIX=. 
 WSIZE=800
 HSIZE=250
diff --git a/regression-tests.nobackend/edns-packet-cache/command b/regression-tests.nobackend/edns-packet-cache/command
index eaba0ecb4..1c4414f16 100755
--- a/regression-tests.nobackend/edns-packet-cache/command
+++ b/regression-tests.nobackend/edns-packet-cache/command
@@ -1,4 +1,6 @@
-#!/bin/bash -ex
+#!/usr/bin/env bash
+set -e
+set -x
 
 bindwait ()
 {
diff --git a/regression-tests.nobackend/pdnsconfdist/command b/regression-tests.nobackend/pdnsconfdist/command
index 36e556838..a77beb532 100755
--- a/regression-tests.nobackend/pdnsconfdist/command
+++ b/regression-tests.nobackend/pdnsconfdist/command
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 diff -u ../pdns/pdns.conf-dist <(../pdns/pdns_server --config)
diff --git a/regression-tests.nobackend/tinydns-data-check/command b/regression-tests.nobackend/tinydns-data-check/command
index 21b1a94a8..5f8b09545 100755
--- a/regression-tests.nobackend/tinydns-data-check/command
+++ b/regression-tests.nobackend/tinydns-data-check/command
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 for zone in `cat ../regression-tests/named.conf | grep zone | cut -f 2 -d \"`
 do
diff --git a/regression-tests/00dnssec-grabkeys/command b/regression-tests/00dnssec-grabkeys/command
index a291ee195..304d49042 100755
--- a/regression-tests/00dnssec-grabkeys/command
+++ b/regression-tests/00dnssec-grabkeys/command
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 rm -f trustedkeys
 rm -f unbound-host.conf
 
diff --git a/regression-tests/1dyndns-update-nsec3params/command b/regression-tests/1dyndns-update-nsec3params/command
index ee43c0e8f..9c0e22ac9 100755
--- a/regression-tests/1dyndns-update-nsec3params/command
+++ b/regression-tests/1dyndns-update-nsec3params/command
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 NSEC3=`cleandig test.dyndns NSEC3PARAM hidesoadetails dnssec`
 echo $NSEC3
diff --git a/regression-tests/5dyndns-restore-zone/command b/regression-tests/5dyndns-restore-zone/command
index 9d1f6a310..da8a53486 100755
--- a/regression-tests/5dyndns-restore-zone/command
+++ b/regression-tests/5dyndns-restore-zone/command
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 [ -z "$GMYSQLDB" ] && GMYSQLDB=pdnstest
 [ -z "$GMYSQLUSER" ] && GMYSQLUSER=root
diff --git a/regression-tests/bind-add-zone/command b/regression-tests/bind-add-zone/command
index eede9aea5..46f41b610 100755
--- a/regression-tests/bind-add-zone/command
+++ b/regression-tests/bind-add-zone/command
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [ "${context:0:4}" != "bind" ]; then
     exit 0
diff --git a/regression-tests/bind-add-zone/stress/addzones.sh b/regression-tests/bind-add-zone/stress/addzones.sh
index 4160c5162..b3aa8fc9d 100755
--- a/regression-tests/bind-add-zone/stress/addzones.sh
+++ b/regression-tests/bind-add-zone/stress/addzones.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 for f in $(seq 1 $AMOUNT); do
     f=addzone$f.com
diff --git a/regression-tests/bind-add-zone/stress/createzones.sh b/regression-tests/bind-add-zone/stress/createzones.sh
index ec5bf5283..d850dcca9 100755
--- a/regression-tests/bind-add-zone/stress/createzones.sh
+++ b/regression-tests/bind-add-zone/stress/createzones.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 for f in $(seq 1 $AMOUNT); do
     f=addzone$f.com
diff --git a/regression-tests/bind-add-zone/stress/dnsperf.sh b/regression-tests/bind-add-zone/stress/dnsperf.sh
index 03b4dd14f..3ad293a59 100755
--- a/regression-tests/bind-add-zone/stress/dnsperf.sh
+++ b/regression-tests/bind-add-zone/stress/dnsperf.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 $DNSPERF -p $port -s localhost -d ./add-zone/stress/tmp/list -c 10 -n 100 -S 10
diff --git a/regression-tests/bind-add-zone/stress/run.sh b/regression-tests/bind-add-zone/stress/run.sh
index 7c6140d30..b05030987 100755
--- a/regression-tests/bind-add-zone/stress/run.sh
+++ b/regression-tests/bind-add-zone/stress/run.sh
@@ -1,4 +1,6 @@
-#!/bin/bash -ex
+#!/usr/bin/env bash
+set -e
+set -x
 
 PDNS=../pdns/pdns_server
 AMOUNT=${1:-1000}
diff --git a/regression-tests/mysqldiff b/regression-tests/mysqldiff
index 94a57d9bd..ce8278a4a 100755
--- a/regression-tests/mysqldiff
+++ b/regression-tests/mysqldiff
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 [ -z "$GMYSQLDB" ] && GMYSQLDB=pdnstest
 [ -z "$GMYSQLUSER" ] && GMYSQLUSER=root
diff --git a/regression-tests/runtests b/regression-tests/runtests
index 6a660598f..193c3b46f 100755
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 PATH=.:$PATH
 MAKE=${MAKE:-make}
 
diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index c4986c666..b40bc3dd4 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -1,4 +1,6 @@
-#!/bin/bash -ex
+#!/usr/bin/env bash
+set -e
+set -x
 
 PDNS=${PDNS:-../pdns/pdns_server}
 PDNS2=${PDNS2:-../pdns/pdns_server}
diff --git a/regression-tests/verify-dnssec-zone/command b/regression-tests/verify-dnssec-zone/command
index da52b1e54..16adf1735 100755
--- a/regression-tests/verify-dnssec-zone/command
+++ b/regression-tests/verify-dnssec-zone/command
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 for zone in $(grep zone named.conf  | cut -f2 -d\" | grep -v '^\(example.com\|nztest.com\)$')
 do
 	TFILE=$(mktemp)