From: Alan Somers Date: Mon, 25 Sep 2017 23:20:40 +0000 (-0600) Subject: scripts: fix bash path in shebangs (part 2) X-Git-Tag: v13.0.1~730^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d1cbb90daa1ea788496001e119597cffcd301a06;p=ceph.git 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 --- diff --git a/bin/git-archive-all.sh b/bin/git-archive-all.sh index 8c292b54d52..513b50a2c49 100755 --- 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 ef9a3318afd..670ea1c328d 100755 --- 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 # diff --git a/src/test/osd/safe-to-destroy.sh b/src/test/osd/safe-to-destroy.sh index ab12dcdfba4..f03a235f7dd 100755 --- 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 397a9ae1c70..da1217e10ab 100755 --- 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 # Copyright (C) 2013 Cloudwatt @@ -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 297bbc7d676..1c79416cbd9 100755 --- 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