From f1e6f93372ca2dcee75e3ef0ee6cbe9945cf41f4 Mon Sep 17 00:00:00 2001 From: наб Date: Sun, 12 Dec 2021 20:27:04 +0100 Subject: Change all fixed-path bash shebangs to /u/b/env bash outside test/ --- .github/workflows/build_test.sh | 2 +- .github/workflows/run_mkosi.sh | 2 +- .github/workflows/unit_tests.sh | 2 +- .semaphore/semaphore-runner.sh | 2 +- coccinelle/run-coccinelle.sh | 3 ++- man/50-xdg-data-dirs.sh | 4 ++-- src/basic/check-filesystems.sh | 2 +- src/rpm/systemd-update-helper.in | 2 +- tools/check-api-docs.sh | 2 +- tools/check-help.sh | 2 +- tools/get-coverity.sh | 2 +- 11 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh index 96f532ab22..5dc54771ba 100755 --- a/.github/workflows/build_test.sh +++ b/.github/workflows/build_test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # SPDX-License-Identifier: LGPL-2.1-or-later set -ex diff --git a/.github/workflows/run_mkosi.sh b/.github/workflows/run_mkosi.sh index 5d4798b5b7..e8803239aa 100755 --- a/.github/workflows/run_mkosi.sh +++ b/.github/workflows/run_mkosi.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # SPDX-License-Identifier: LGPL-2.1-or-later # shellcheck disable=SC2064 diff --git a/.github/workflows/unit_tests.sh b/.github/workflows/unit_tests.sh index ec7e92a49a..9c7beb6d19 100755 --- a/.github/workflows/unit_tests.sh +++ b/.github/workflows/unit_tests.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # SPDX-License-Identifier: LGPL-2.1-or-later # shellcheck disable=SC2206 diff --git a/.semaphore/semaphore-runner.sh b/.semaphore/semaphore-runner.sh index 381504fd3b..d02b449e0e 100755 --- a/.semaphore/semaphore-runner.sh +++ b/.semaphore/semaphore-runner.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # SPDX-License-Identifier: LGPL-2.1-or-later set -eux diff --git a/coccinelle/run-coccinelle.sh b/coccinelle/run-coccinelle.sh index becb38bf91..3249722863 100755 --- a/coccinelle/run-coccinelle.sh +++ b/coccinelle/run-coccinelle.sh @@ -1,5 +1,6 @@ -#!/bin/bash -e +#!/usr/bin/env bash # SPDX-License-Identifier: LGPL-2.1-or-later +set -e # Exclude following paths from the Coccinelle transformations EXCLUDED_PATHS=( diff --git a/man/50-xdg-data-dirs.sh b/man/50-xdg-data-dirs.sh index 02216abf6c..5f042c5511 100755 --- a/man/50-xdg-data-dirs.sh +++ b/man/50-xdg-data-dirs.sh @@ -1,11 +1,11 @@ -#!/bin/bash +#!/bin/sh # SPDX-License-Identifier: CC0-1.0 # set the default value XDG_DATA_DIRS="${XDG_DATA_DIRS:-/usr/local/share/:/usr/share}" # add a directory if it exists -if [[ -d /opt/foo/share ]]; then +if [ -d /opt/foo/share ]; then XDG_DATA_DIRS="/opt/foo/share:${XDG_DATA_DIRS}" fi diff --git a/src/basic/check-filesystems.sh b/src/basic/check-filesystems.sh index 026574652e..696ef610ac 100755 --- a/src/basic/check-filesystems.sh +++ b/src/basic/check-filesystems.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # SPDX-License-Identifier: LGPL-2.1-or-later set -eu set -o pipefail diff --git a/src/rpm/systemd-update-helper.in b/src/rpm/systemd-update-helper.in index 7e007d4806..ab8cdc0ff9 100755 --- a/src/rpm/systemd-update-helper.in +++ b/src/rpm/systemd-update-helper.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # SPDX-License-Identifier: LGPL-2.1-or-later set -eu set -o pipefail diff --git a/tools/check-api-docs.sh b/tools/check-api-docs.sh index 0bf053b5ff..2e973a088b 100755 --- a/tools/check-api-docs.sh +++ b/tools/check-api-docs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # SPDX-License-Identifier: LGPL-2.1-or-later set -eu set -o pipefail diff --git a/tools/check-help.sh b/tools/check-help.sh index 8e7d236dd9..76ac292675 100755 --- a/tools/check-help.sh +++ b/tools/check-help.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # SPDX-License-Identifier: LGPL-2.1-or-later set -eu set -o pipefail diff --git a/tools/get-coverity.sh b/tools/get-coverity.sh index 00219bf60f..b067ed23eb 100755 --- a/tools/get-coverity.sh +++ b/tools/get-coverity.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # SPDX-License-Identifier: LGPL-2.1-or-later # Download and extract coverity tool -- cgit v1.2.3