diff options
author | Sascha Grunert <sgrunert@suse.com> | 2020-08-17 09:18:02 +0200 |
---|---|---|
committer | Sascha Grunert <sgrunert@suse.com> | 2020-08-17 10:42:23 +0200 |
commit | ba9f18e2b87a1dc6b9f7fea304379c4e41aaaa85 (patch) | |
tree | a8eacd3359e2ce22a2ded1f7efedc39c045272b5 /contrib | |
parent | 96fb5dc94d88bc4eafe82382bfb26b64c479f76b (diff) | |
download | podman-ba9f18e2b87a1dc6b9f7fea304379c4e41aaaa85.tar.gz podman-ba9f18e2b87a1dc6b9f7fea304379c4e41aaaa85.tar.bz2 podman-ba9f18e2b87a1dc6b9f7fea304379c4e41aaaa85.zip |
Use `bash` binary from env instead of /bin/bash for scripts
It's not possible to run any of the scripts on distributions which do
have `bash` not in `/bin`. This is being fixed by using `/usr/bin/env
bash` instead.
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
Diffstat (limited to 'contrib')
38 files changed, 38 insertions, 38 deletions
diff --git a/contrib/build_rpm.sh b/contrib/build_rpm.sh index a4f1817b9..6a82b131f 100755 --- a/contrib/build_rpm.sh +++ b/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 ... diff --git a/contrib/cirrus/add_second_partition.sh b/contrib/cirrus/add_second_partition.sh index 73db192c5..3c2f9f056 100644 --- a/contrib/cirrus/add_second_partition.sh +++ b/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! diff --git a/contrib/cirrus/apiv2_test.sh b/contrib/cirrus/apiv2_test.sh index 546fe8e30..dbee078b6 100755 --- a/contrib/cirrus/apiv2_test.sh +++ b/contrib/cirrus/apiv2_test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/contrib/cirrus/build_release.sh b/contrib/cirrus/build_release.sh index 45634f368..46fe9781f 100755 --- a/contrib/cirrus/build_release.sh +++ b/contrib/cirrus/build_release.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/contrib/cirrus/build_swagger.sh b/contrib/cirrus/build_swagger.sh index 0471f0c10..eb9288dcd 100755 --- a/contrib/cirrus/build_swagger.sh +++ b/contrib/cirrus/build_swagger.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/contrib/cirrus/build_vm_images.sh b/contrib/cirrus/build_vm_images.sh index 543f83a14..be1c82185 100755 --- a/contrib/cirrus/build_vm_images.sh +++ b/contrib/cirrus/build_vm_images.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e source $(dirname $0)/lib.sh diff --git a/contrib/cirrus/check_image.sh b/contrib/cirrus/check_image.sh index 13172fe1c..04867ca64 100755 --- a/contrib/cirrus/check_image.sh +++ b/contrib/cirrus/check_image.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eo pipefail diff --git a/contrib/cirrus/container_test.sh b/contrib/cirrus/container_test.sh index b56a12232..8ea66e63c 100644 --- a/contrib/cirrus/container_test.sh +++ b/contrib/cirrus/container_test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -xeo pipefail export GOPATH=/var/tmp/go diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh index c65f5e25f..636d67411 100755 --- a/contrib/cirrus/integration_test.sh +++ b/contrib/cirrus/integration_test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 968b2de39..3292e9d14 100644 --- a/contrib/cirrus/lib.sh +++ b/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 diff --git a/contrib/cirrus/lib.sh.t b/contrib/cirrus/lib.sh.t index 8f4080dd5..204af1245 100755 --- a/contrib/cirrus/lib.sh.t +++ b/contrib/cirrus/lib.sh.t @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Unit tests for some functions in lib.sh # diff --git a/contrib/cirrus/logcollector.sh b/contrib/cirrus/logcollector.sh index 859da2966..fd5017b44 100755 --- a/contrib/cirrus/logcollector.sh +++ b/contrib/cirrus/logcollector.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/contrib/cirrus/networking.sh b/contrib/cirrus/networking.sh index 2546fab71..824d03e44 100755 --- a/contrib/cirrus/networking.sh +++ b/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 diff --git a/contrib/cirrus/notice_branch_failure.sh b/contrib/cirrus/notice_branch_failure.sh index f030c12e5..b810bd266 100755 --- a/contrib/cirrus/notice_branch_failure.sh +++ b/contrib/cirrus/notice_branch_failure.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/contrib/cirrus/ooe.sh b/contrib/cirrus/ooe.sh index 3c8a0409d..0966b5ce8 100755 --- a/contrib/cirrus/ooe.sh +++ b/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, diff --git a/contrib/cirrus/packer/fedora_base-setup.sh b/contrib/cirrus/packer/fedora_base-setup.sh index f271abee0..bf29a1aec 100644 --- a/contrib/cirrus/packer/fedora_base-setup.sh +++ b/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 diff --git a/contrib/cirrus/packer/fedora_packaging.sh b/contrib/cirrus/packer/fedora_packaging.sh index 4a8f62e45..fcf9eb93f 100644 --- a/contrib/cirrus/packer/fedora_packaging.sh +++ b/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 diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index 25b568e8a..16ae87d8a 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/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. diff --git a/contrib/cirrus/packer/image-builder-image_base-setup.sh b/contrib/cirrus/packer/image-builder-image_base-setup.sh index 78772da09..26fbe2903 100644 --- a/contrib/cirrus/packer/image-builder-image_base-setup.sh +++ b/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 diff --git a/contrib/cirrus/packer/make-user-data.sh b/contrib/cirrus/packer/make-user-data.sh index 7f7fa1c1a..676a50f5c 100644 --- a/contrib/cirrus/packer/make-user-data.sh +++ b/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 diff --git a/contrib/cirrus/packer/prior-fedora_base-setup.sh b/contrib/cirrus/packer/prior-fedora_base-setup.sh index f271abee0..bf29a1aec 100644 --- a/contrib/cirrus/packer/prior-fedora_base-setup.sh +++ b/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 diff --git a/contrib/cirrus/packer/systemd_banish.sh b/contrib/cirrus/packer/systemd_banish.sh index 6e2dd9c3e..2219f2a4f 100755 --- a/contrib/cirrus/packer/systemd_banish.sh +++ b/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 diff --git a/contrib/cirrus/packer/ubuntu_packaging.sh b/contrib/cirrus/packer/ubuntu_packaging.sh index 935e81147..c478028b5 100644 --- a/contrib/cirrus/packer/ubuntu_packaging.sh +++ b/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 diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh index 2febbd265..d650e6c76 100644 --- a/contrib/cirrus/packer/ubuntu_setup.sh +++ b/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. diff --git a/contrib/cirrus/packer/xfedora_setup.sh b/contrib/cirrus/packer/xfedora_setup.sh index 25b568e8a..16ae87d8a 100644 --- a/contrib/cirrus/packer/xfedora_setup.sh +++ b/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. diff --git a/contrib/cirrus/rootless_test.sh b/contrib/cirrus/rootless_test.sh index 63cbec69b..31db18302 100755 --- a/contrib/cirrus/rootless_test.sh +++ b/contrib/cirrus/rootless_test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/contrib/cirrus/setup_container_environment.sh b/contrib/cirrus/setup_container_environment.sh index c268c162e..72542df17 100755 --- a/contrib/cirrus/setup_container_environment.sh +++ b/contrib/cirrus/setup_container_environment.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e source $(dirname $0)/lib.sh diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 0b9d686d3..eeae96469 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/contrib/cirrus/success.sh b/contrib/cirrus/success.sh index 3b171757f..8783f6b81 100755 --- a/contrib/cirrus/success.sh +++ b/contrib/cirrus/success.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/contrib/cirrus/system_test.sh b/contrib/cirrus/system_test.sh index 546fe8e30..dbee078b6 100755 --- a/contrib/cirrus/system_test.sh +++ b/contrib/cirrus/system_test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/contrib/cirrus/unit_test.sh b/contrib/cirrus/unit_test.sh index 2852c31ae..17a618a1c 100755 --- a/contrib/cirrus/unit_test.sh +++ b/contrib/cirrus/unit_test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/contrib/cirrus/update_meta.sh b/contrib/cirrus/update_meta.sh index 618cd670c..6e4a473e9 100755 --- a/contrib/cirrus/update_meta.sh +++ b/contrib/cirrus/update_meta.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source $(dirname $0)/lib.sh diff --git a/contrib/cirrus/upload_release_archive.sh b/contrib/cirrus/upload_release_archive.sh index e1b8937b7..2e2f4ddde 100755 --- a/contrib/cirrus/upload_release_archive.sh +++ b/contrib/cirrus/upload_release_archive.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eo pipefail diff --git a/contrib/gate/entrypoint.sh b/contrib/gate/entrypoint.sh index ab6528e00..102d012e5 100755 --- a/contrib/gate/entrypoint.sh +++ b/contrib/gate/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/contrib/imgprune/entrypoint.sh b/contrib/imgprune/entrypoint.sh index b0f006332..fd80d9b26 100755 --- a/contrib/imgprune/entrypoint.sh +++ b/contrib/imgprune/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/contrib/imgts/entrypoint.sh b/contrib/imgts/entrypoint.sh index 9c653eda0..b089e1e9b 100755 --- a/contrib/imgts/entrypoint.sh +++ b/contrib/imgts/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/contrib/imgts/lib_entrypoint.sh b/contrib/imgts/lib_entrypoint.sh index 3f6b11128..6eb5cdc2f 100644 --- a/contrib/imgts/lib_entrypoint.sh +++ b/contrib/imgts/lib_entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/contrib/upldrel/entrypoint.sh b/contrib/upldrel/entrypoint.sh index dc0e69676..6eb1b8f94 100755 --- a/contrib/upldrel/entrypoint.sh +++ b/contrib/upldrel/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e |