Merge pull request #7333 from openSUSE/bashify

Use `bash` binary from env instead of /bin/bash for scripts

contrib/build_rpm.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euxo pipefail
 
 # returned path can vary: /usr/bin/dnf /bin/dnf ...

contrib/cirrus/add_second_partition.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # N/B: This script could mega f*!@up your disks if run by mistake.
 #      it is left without the execute-bit on purpose!

contrib/cirrus/apiv2_test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

contrib/cirrus/build_release.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

contrib/cirrus/build_swagger.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

contrib/cirrus/build_vm_images.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 source $(dirname $0)/lib.sh

contrib/cirrus/check_image.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -eo pipefail
 

contrib/cirrus/container_test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -xeo pipefail
 
 export GOPATH=/var/tmp/go

contrib/cirrus/integration_test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

contrib/cirrus/lib.sh

@@ -376,7 +376,7 @@ install_scl_git() {
     echo "Installing SoftwareCollections updated 'git' version."
     ooe.sh $SUDO yum -y install rh-git29
     cat << "EOF" | $SUDO tee /usr/bin/git
-#!/bin/bash
+#!/usr/bin/env bash
 
 scl enable rh-git29 -- git $@
 EOF

contrib/cirrus/lib.sh.t

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Unit tests for some functions in lib.sh
 #

contrib/cirrus/logcollector.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

contrib/cirrus/networking.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script attempts basic confirmation of functional networking
 # by connecting to a set of essential external servers and failing

contrib/cirrus/notice_branch_failure.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

contrib/cirrus/ooe.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script executes a command while logging all output to a temporary
 # file.  If the command exits non-zero, then all output is sent to the console,

contrib/cirrus/packer/fedora_base-setup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # N/B: This script is not intended to be run by humans.  It is used to configure the
 # fedora base image for importing, so that it will boot in GCE

contrib/cirrus/packer/fedora_packaging.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script is called from fedora_setup.sh and various Dockerfiles.
 # It's not intended to be used outside of those contexts.  It assumes the lib.sh

contrib/cirrus/packer/fedora_setup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script is called by packer on the subject fedora VM, to setup the podman
 # build/test environment.  It's not intended to be used outside of this context.

contrib/cirrus/packer/image-builder-image_base-setup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script is called by packer on a vanilla CentOS VM, to setup the image
 # used for building images FROM base images. It's not intended to be used

contrib/cirrus/packer/make-user-data.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script is utilized by Makefile, it's not intended to be run by humans
 

contrib/cirrus/packer/prior-fedora_base-setup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # N/B: This script is not intended to be run by humans.  It is used to configure the
 # fedora base image for importing, so that it will boot in GCE

contrib/cirrus/packer/systemd_banish.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set +e  # Not all of these exist on every platform
 

contrib/cirrus/packer/ubuntu_packaging.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script is called from ubuntu_setup.sh and various Dockerfiles.
 # It's not intended to be used outside of those contexts.  It assumes the lib.sh

contrib/cirrus/packer/ubuntu_setup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script is called by packer on the subject Ubuntu VM, to setup the podman
 # build/test environment.  It's not intended to be used outside of this context.

contrib/cirrus/packer/xfedora_setup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script is called by packer on the subject fedora VM, to setup the podman
 # build/test environment.  It's not intended to be used outside of this context.

contrib/cirrus/rootless_test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

contrib/cirrus/setup_container_environment.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 source $(dirname $0)/lib.sh

contrib/cirrus/setup_environment.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

contrib/cirrus/success.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

contrib/cirrus/system_test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

contrib/cirrus/unit_test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

contrib/cirrus/update_meta.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 source $(dirname $0)/lib.sh
 

contrib/cirrus/upload_release_archive.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -eo pipefail
 

contrib/gate/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

contrib/imgprune/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

contrib/imgts/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

contrib/imgts/lib_entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

contrib/upldrel/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

docs/remote-docs.sh

@@ -1,5 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 # Assemble remote man pages for darwin or windows from markdown files
+set -e
 
 PLATFORM=$1                         ## linux, windows or darwin
 TARGET=${2}                         ## where to output files

hack/apparmor_tag.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 if pkg-config libapparmor 2> /dev/null ; then
 	echo apparmor
 fi

hack/btrfs_installed_tag.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 cc -E - > /dev/null 2> /dev/null << EOF
 #include <btrfs/ioctl.h>
 EOF

hack/btrfs_tag.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 cc -E - > /dev/null 2> /dev/null << EOF
 #include <btrfs/version.h>
 EOF

hack/check_root.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 if ! [ $(id -u) = 0 ]; then
    echo "Please run as root! '$@' requires root privileges."
    exit 1

hack/get_ci_vm.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

hack/get_release_info.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script produces various bits of metadata needed by Makefile.  Using
 # a script allows uniform behavior across multiple environments and

hack/golangci-lint.sh

@@ -1,6 +1,7 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 
 # Need to run linter twice to cover all the build tags code paths
+set -e
 
 declare -A BUILD_TAGS
 # TODO: add systemd tag

hack/install_bats.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

hack/install_catatonit.sh

@@ -1,7 +1,8 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 BASE_PATH="/usr/libexec/podman"
 CATATONIT_PATH="${BASE_PATH}/catatonit"
 CATATONIT_VERSION="v0.1.4"
+set -e
 
 if [ -f $CATATONIT_PATH ]; then
 	echo "skipping ... catatonit is already installed"

hack/install_golangci.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

hack/libdm_tag.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 tmpdir="$PWD/tmp.$RANDOM"
 mkdir -p "$tmpdir"
 trap 'rm -fr "$tmpdir"' EXIT

hack/man-page-checker

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # man-page-checker - validate and cross-reference man page names
 #

hack/podman-commands.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Compare commands listed by 'podman help' against those in 'man podman'.
 # Recurse into subcommands as well.

hack/podmanv2-retry

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # podman-try - try running a command via PODMAN1; use PODMAN2 as fallback
 #

hack/selinux_tag.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 if pkg-config libselinux 2> /dev/null ; then
 	echo selinux
 fi

hack/tree_status.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 SUGGESTION="${SUGGESTION:-sync the vendor.conf and commit all changes.}"

test/apiv2/test-apiv2

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Usage: test-apiv2 [PORT]
 #

test/system/400-unprivileged-access.bats

@@ -23,7 +23,7 @@ load helpers
     # as a user, the parent directory must be world-readable.
     test_script=$PODMAN_TMPDIR/fail-if-writable
     cat >$test_script <<"EOF"
-#!/bin/bash
+#!/usr/bin/env bash
 
 path="$1"
 

test/system/helpers.t

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # regression tests for helpers.bash
 #

test/test_podman_baseline.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # test_podman_baseline.sh
 # A script to be run at the command line with Podman installed.
 # This should be run against a new kit to provide base level testing
@@ -215,7 +215,7 @@ podman run $image ls /
 ########
 FILE=./runecho.sh
 /bin/cat <<EOM >$FILE
-#!/bin/bash
+#!/usr/bin/env bash
 for i in {1..9};
 do
     echo "This is a new container pull ipbabble [" \$i "]"

test/test_podman_build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # test_podman_build.sh
 #

test/test_podman_pods.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # test_podman_pods.sh
 # A script to be run at the command line with Podman installed.
 # This should be run against a new kit to provide base level testing