scripts: fix bash path in shebangs (part 2)

/bin/bash is a Linuxism.  Other operating systems install bash to
different paths.  Use /usr/bin/env in shebangs to find bash.

Signed-off-by: Alan Somers <asomers@gmail.com>

diff --git a/bin/git-archive-all.sh b/bin/git-archive-all.sh
index 8c292b54d522859ce03d1cc3932a14174dd37803..513b50a2c491120aaaf6e1bbd1452afb5561f26a 100755 (executable)
--- a/bin/git-archive-all.sh
+++ b/bin/git-archive-all.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -
+#!/usr/bin/env bash
 #
 # File:        git-archive-all.sh
 #

diff --git a/qa/standalone/scrub/osd-recovery-scrub.sh b/qa/standalone/scrub/osd-recovery-scrub.sh
index ef9a3318afd8f28d0c589ce37a3a090e585da72d..670ea1c328d870c946b4c4373443907a4316a453 100755 (executable)
--- a/qa/standalone/scrub/osd-recovery-scrub.sh
+++ b/qa/standalone/scrub/osd-recovery-scrub.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 #
 # Copyright (C) 2017 Red Hat <contact@redhat.com>
 #

diff --git a/src/test/osd/safe-to-destroy.sh b/src/test/osd/safe-to-destroy.sh
index ab12dcdfba438aeb5dc135c506c295846a3a1ef4..f03a235f7dda3de4eab917bf1f559e947121c00d 100755 (executable)
--- a/src/test/osd/safe-to-destroy.sh
+++ b/src/test/osd/safe-to-destroy.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 source $CEPH_ROOT/qa/standalone/ceph-helpers.sh
 

diff --git a/src/test/rbd-ggate.sh b/src/test/rbd-ggate.sh
index 397a9ae1c709413742c34ba2f6a70e5109710264..da1217e10abcf70d4e29d48a971ccd6551347ee2 100755 (executable)
--- a/src/test/rbd-ggate.sh
+++ b/src/test/rbd-ggate.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/usr/bin/env bash
 #
 # Copyright (C) 2014, 2015 Red Hat <contact@redhat.com>
 # Copyright (C) 2013 Cloudwatt <libre.licensing@cloudwatt.com>
@@ -15,6 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+set -ex
 source $(dirname $0)/detect-build-env-vars.sh
 
 test `uname` = FreeBSD

diff --git a/src/test/smoke.sh b/src/test/smoke.sh
index 297bbc7d676616bfe90c6f387cb6ea79b608f886..1c79416cbd91c4bd4f235a83787a84c2c7360e87 100755 (executable)
--- a/src/test/smoke.sh
+++ b/src/test/smoke.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 source $CEPH_ROOT/qa/standalone/ceph-helpers.sh