Merge pull request ceph#16494 from asomers/bin_bash

misc: Fix bash path in shebangs

Reviewed-by: Willem Jan Withagen <[email protected]>
Reviewed-by: Kefu Chai <[email protected]>

README.FreeBSD

@@ -28,7 +28,7 @@ Other improvements:
 	easy creation of OSDs.
   -	RBD is actually buildable and can be used to manage RADOS BLOCK 
 	DEVICEs.
-  -	Most of the awkward dependencies on Linux-isms are deleted only 
+  -	Most of the awkward dependencies on Linux-isms are deleted only
 	/bin/bash is there to stay.
 
 Getting the FreeBSD work on Ceph:

examples/rbd-replay/create-image

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 pool=rbd
 image=my-image

examples/rbd-replay/replay

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 lttng create
 lttng enable-event -u 'librbd:*'

examples/rbd-replay/run-rbd-replay-prep

@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ../../src/rbd-replay-prep traces/ust/uid/10002/64-bit replay.bin

examples/rbd-replay/trace

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 mkdir -p traces
 lttng create -o traces librbd

install-deps.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 #
 # Ceph distributed storage system
 #
@@ -11,6 +11,7 @@
 #  License as published by the Free Software Foundation; either
 #  version 2.1 of the License, or (at your option) any later version.
 #
+set -e
 DIR=/tmp/install-deps.$$
 trap "rm -fr $DIR" EXIT
 mkdir -p $DIR

make-debs.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2015 Red Hat <[email protected]>
 #

mirroring/mirror-ceph.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 #
 # Script to mirror Ceph locally

mirroring/test-mirrors.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Simple script which performs a HTTP and rsync check on
 # all Ceph mirrors over IPv4 and IPv6 to see if they are online

qa/client/30_subdir_mount.sh

@@ -1,4 +1,5 @@
-#!/bin/bash -x
+#!/usr/bin/env bash
+set -x
 
 basedir=`echo $0 | sed 's/[^/]*$//g'`.
 . $basedir/common.sh

qa/client/gen-1774.sh

@@ -1,4 +1,5 @@
-#! /bin/bash -e
+#!/usr/bin/env bash
+set -e
 
 mount () { :; }
 umount () { :; }

qa/loopall.sh

@@ -1,6 +1,6 @@
-#!/bin/bash -x
+#!/usr/bin/env bash
 
-set -e
+set -ex
 
 basedir=`echo $0 | sed 's/[^/]*$//g'`.
 testdir="$1"

qa/machine_types/schedule_rados_ovh.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # $1 - part
 # $2 - branch name

qa/machine_types/schedule_subset.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #command line => CEPH_BRANCH=<branch>; MACHINE_NAME=<machine_type>; SUITE_NAME=<suite>; ../schedule_subset.sh <day_of_week> $CEPH_BRANCH $MACHINE_NAME $SUITE_NAME $CEPH_QA_EMAIL
 

qa/mds/test_anchortable.sh

@@ -1,4 +1,5 @@
-#!/bin/bash -x
+#!/usr/bin/env bash
+set -x
 
 mkdir links
 for f in `seq 1 8`

qa/mds/test_mdstable_failures.sh

@@ -1,4 +1,5 @@
-#!/bin/bash -x
+#!/usr/bin/env bash
+set -x
 
 for f in `seq 1 8`
 do

qa/nightlies/cron_wrapper

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # /nightlies/cron_wrapper.sh
 
 # check for no argument case and stop

qa/qa_scripts/openstack/ceph_install_w_ansible/ceph_install.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 if [ $# -ne 5 ]; then
     echo 'Usage: ceph_install.sh <admin-node> <mon-node> <osd-node> <osd-node> <osd-node>'
     exit -1

qa/qa_scripts/openstack/ceph_install_w_ansible/execs/cdn_setup.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 if [ -f ~/secrets ]; then
     source ~/secrets
 fi

qa/qa_scripts/openstack/ceph_install_w_ansible/execs/ceph_ansible.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 cephnodes=$*
 monnode=$1
 sudo yum -y install ceph-ansible

qa/qa_scripts/openstack/ceph_install_w_ansible/execs/edit_ansible_hosts.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 ed /etc/ansible/hosts << EOF
 $
 a

qa/qa_scripts/openstack/ceph_install_w_ansible/execs/edit_groupvars_osds.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 ed /usr/share/ceph-ansible/group_vars/osds << EOF
 $
 /^devices:

qa/qa_scripts/openstack/ceph_install_w_ansible/multi_action.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 source copy_func.sh
 allparms=$*
 cmdv=$1

qa/qa_scripts/openstack/ceph_install_w_ansible/repolocs.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 SPECIFIC_VERSION=latest-Ceph-2-RHEL-7 
 #SPECIFIC_VERSION=Ceph-2-RHEL-7-20160630.t.0
 #SPECIFIC_VERSION=Ceph-2.0-RHEL-7-20160718.t.0

qa/qa_scripts/openstack/ceph_install_w_ansible/staller.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 cmd_wait=$1
 shift
 sites=$*

qa/qa_scripts/openstack/ceph_install_w_ansible/talknice.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 declare -A rsapub
 for fulln in $*; do
     sname=`echo $fulln | sed 's/\..*//'`

qa/qa_scripts/openstack/execs/ceph-pool-create.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -f
+#!/usr/bin/env bash
+set -f
+
 #
 # On the ceph site, make the pools required for Openstack
 #

qa/qa_scripts/openstack/execs/ceph_cluster.sh

@@ -1,4 +1,6 @@
-#! /bin/bash -f
+#!/usr/bin/env bash
+set -f
+
 echo $OS_CEPH_ISO
 if [[ $# -ne 4 ]]; then
     echo "Usage: ceph_cluster mon.0 osd.0 osd.1 osd.2"

qa/qa_scripts/openstack/execs/libvirt-secret.sh

@@ -1,4 +1,5 @@
-#!/bin/bash -f
+#!/usr/bin/env bash
+set -f
 
 #
 # Generate a libvirt secret on the Openstack node. 

qa/qa_scripts/openstack/execs/openstack-preinstall.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -f
+#!/usr/bin/env bash
+set -f
+
 #
 # Remotely setup the stuff needed to run packstack.  This should do items 1-4 in
 # https://docs.google.com/document/d/1us18KR3LuLyINgGk2rmI-SVj9UksCE7y4C2D_68Aa8o/edit?ts=56a78fcb

qa/qa_scripts/openstack/execs/run_openstack.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -fv
+#!/usr/bin/env bash
+set -fv
+
 #
 # Create a glance image, a corresponding cinder volume, a nova instance, attach, the cinder volume to the
 # nova instance, and create a backup.

qa/qa_scripts/openstack/execs/start_openstack.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -fv
+#!/usr/bin/env bash
+set -fv
+
 #
 # start the Openstack services
 #

qa/rbd/common.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 die() {
 	echo "$*"

qa/rbd/rbd.sh

@@ -1,4 +1,5 @@
-#!/bin/bash -x
+#!/usr/bin/env bash
+set -x
 
 basedir=`echo $0 | sed 's/[^/]*$//g'`.
 . $basedir/common.sh

qa/run_xfstests-obsolete.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Copyright (C) 2012 Dreamhost, LLC
 #

qa/run_xfstests.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Copyright (C) 2012 Dreamhost, LLC
 #

qa/run_xfstests_krbd.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This is a wrapper around run_xfstests.sh to provide an expunge file
 # suitable for krbd xfstests runs.

qa/run_xfstests_qemu.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # TODO switch to run_xfstests.sh (see run_xfstests_krbd.sh)
 

qa/runallonce.sh

@@ -1,6 +1,6 @@
-#!/bin/bash -x
+#!/usr/bin/env bash
 
-set -e
+set -ex
 
 basedir=`echo $0 | sed 's/[^/]*$//g'`.
 testdir="$1"

qa/runoncfuse.sh

@@ -1,4 +1,5 @@
-#!/bin/bash -x
+#!/usr/bin/env bash
+set -x
 
 mkdir -p testspace
 ceph-fuse testspace -m $1

qa/runonkclient.sh

@@ -1,8 +1,9 @@
-#!/bin/bash -x
+#!/usr/bin/env bash
+set -x
 
 mkdir -p testspace
 /bin/mount -t ceph $1 testspace
 
 ./runallonce.sh testspace
 
-/bin/umount testspace
+/bin/umount testspace

qa/setup-chroot.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 die() {
         echo ${@}

qa/standalone/ceph-helpers.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2013,2014 Cloudwatt <[email protected]>
 # Copyright (C) 2014,2015 Red Hat <[email protected]>

qa/standalone/crush/crush-choose-args.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2017 Red Hat <[email protected]>
 #

qa/standalone/crush/crush-classes.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2017 Red Hat <[email protected]>
 #

qa/standalone/erasure-code/test-erasure-code-plugins.sh

@@ -1,4 +1,5 @@
-#!/bin/bash -x
+#!/usr/bin/env bash
+set -x
 
 source $CEPH_ROOT/qa/standalone/ceph-helpers.sh
 

qa/standalone/erasure-code/test-erasure-code.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2014 Cloudwatt <[email protected]>
 # Copyright (C) 2014, 2015 Red Hat <[email protected]>

qa/standalone/erasure-code/test-erasure-eio.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2015 Red Hat <[email protected]>
 #

qa/standalone/misc/rados-striper.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2014 Red Hat <[email protected]>
 #

qa/standalone/misc/test-ceph-helpers.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2013,2014 Cloudwatt <[email protected]>
 # Copyright (C) 2014 Red Hat <[email protected]>

qa/standalone/mon/misc.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2014 Cloudwatt <[email protected]>
 # Copyright (C) 2014, 2015 Red Hat <[email protected]>

qa/standalone/mon/mkfs.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2013 Cloudwatt <[email protected]>
 # Copyright (C) 2014 Red Hat <[email protected]>

qa/standalone/mon/mon-bind.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2017 Quantum Corp.
 #

qa/standalone/mon/mon-created-time.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2015 SUSE LINUX GmbH
 #

qa/standalone/mon/mon-handle-forward.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2013 Cloudwatt <[email protected]>
 # Copyright (C) 2014,2015 Red Hat <[email protected]>

qa/standalone/mon/mon-ping.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2015 SUSE LINUX GmbH
 #

qa/standalone/mon/mon-scrub.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2014 Cloudwatt <[email protected]>
 # Copyright (C) 2014, 2015 Red Hat <[email protected]>

qa/standalone/mon/osd-crush.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2014 Cloudwatt <[email protected]>
 # Copyright (C) 2014, 2015 Red Hat <[email protected]>

qa/standalone/mon/osd-erasure-code-profile.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2014 Cloudwatt <[email protected]>
 # Copyright (C) 2014, 2015 Red Hat <[email protected]>