mkosi: /bin/bash -> /usr/bin/env bash

This is analogous to a change in mkosi[1] with the same motivation: some
scripts are run to bootstrap the distribution tree and are thus running
directly on the host system which may not have `/bin/bash` (e.g. NixOS).

As with the `mkosi` change, do that for each shebang for consistency
reasons.

[1] https://github.com/systemd/mkosi/commit/8d2cd50e5192cada7211724ecff3514f0c85cf0f

diff --git a/mkosi/mkosi.clangd b/mkosi/mkosi.clangd
index ba7aa99ad64ca2288fa53b5a4d703ce7e2600299..7cac6cecbfd0a9db19713ce73e8b1dce8653f026 100755 (executable)
--- a/mkosi/mkosi.clangd
+++ b/mkosi/mkosi.clangd
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 

diff --git a/mkosi/mkosi.clean b/mkosi/mkosi.clean
index dac2f1bf42153a7a6dbb28b67a6b8dbcbb5f905a..510da46cee704cd894bc7c0874727e569a1b3abe 100755 (executable)
--- a/mkosi/mkosi.clean
+++ b/mkosi/mkosi.clean
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 set -e

diff --git a/mkosi/mkosi.conf.d/arch/systemd.prepare b/mkosi/mkosi.conf.d/arch/systemd.prepare
index 052ce928652868885dfc281cd8bdf08d958267e1..72e831df3b08d9b58d535cc78a0587225879e577 100755 (executable)
--- a/mkosi/mkosi.conf.d/arch/systemd.prepare
+++ b/mkosi/mkosi.conf.d/arch/systemd.prepare
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 

diff --git a/mkosi/mkosi.conf.d/centos-fedora/mkosi.prepare b/mkosi/mkosi.conf.d/centos-fedora/mkosi.prepare
index 4b554c8a3036977476c3539660032e0836a495d8..2eb307045e608358178762a105e31116a6334525 100755 (executable)
--- a/mkosi/mkosi.conf.d/centos-fedora/mkosi.prepare
+++ b/mkosi/mkosi.conf.d/centos-fedora/mkosi.prepare
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 

diff --git a/mkosi/mkosi.conf.d/centos-fedora/systemd.prepare b/mkosi/mkosi.conf.d/centos-fedora/systemd.prepare
index 9e5185bbc6def5f2a17c2cf50a3852c27d2cfc3a..1872f619a85acc19d7c895b910e2fd78bed72ce4 100755 (executable)
--- a/mkosi/mkosi.conf.d/centos-fedora/systemd.prepare
+++ b/mkosi/mkosi.conf.d/centos-fedora/systemd.prepare
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 

diff --git a/mkosi/mkosi.conf.d/debian-ubuntu/systemd.prepare b/mkosi/mkosi.conf.d/debian-ubuntu/systemd.prepare
index 22be35f823850a2299a333e05c166004b6c453c7..e2fb5f23a7b7a336d9a9aaea2a368ef884f81d0b 100755 (executable)
--- a/mkosi/mkosi.conf.d/debian-ubuntu/systemd.prepare
+++ b/mkosi/mkosi.conf.d/debian-ubuntu/systemd.prepare
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 

diff --git a/mkosi/mkosi.conf.d/opensuse/systemd.prepare b/mkosi/mkosi.conf.d/opensuse/systemd.prepare
index 32a9312d293c4f6abfe72b19fe8666e045474417..8a87b6e97cc6368b5dda957f7032a229e85d3fbc 100755 (executable)
--- a/mkosi/mkosi.conf.d/opensuse/systemd.prepare
+++ b/mkosi/mkosi.conf.d/opensuse/systemd.prepare
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 

diff --git a/mkosi/mkosi.coverage/mkosi.postinst b/mkosi/mkosi.coverage/mkosi.postinst
index 5b1002212ee1a9149286545fd6158d983a60cb7b..964668e1a4747d1a79f53c1eb28c43925dcd4f99 100755 (executable)
--- a/mkosi/mkosi.coverage/mkosi.postinst
+++ b/mkosi/mkosi.coverage/mkosi.postinst
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 

diff --git a/mkosi/mkosi.extra.common/usr/lib/systemd/coverage-forwarder b/mkosi/mkosi.extra.common/usr/lib/systemd/coverage-forwarder
index e6c7a88a4dfa7e792304027d7a13e387e3cfaa9a..43691ba0006f1ee23776598b3d9f25b849809dcd 100755 (executable)
--- a/mkosi/mkosi.extra.common/usr/lib/systemd/coverage-forwarder
+++ b/mkosi/mkosi.extra.common/usr/lib/systemd/coverage-forwarder
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 logger --journald <<EOF

diff --git a/mkosi/mkosi.finalize b/mkosi/mkosi.finalize
index 99c9d7c7620dcb6812e5a4d7e23d69d0f5a55ef6..5d893c50530f443a44a77c130db6c58a82a49190 100755 (executable)
--- a/mkosi/mkosi.finalize
+++ b/mkosi/mkosi.finalize
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: CC-0
 set -e
 

diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot
index 76fdece83baab02c304d3359afeb42868e398805..e6299ae3bac23ed810ba411ca1e8ccc496db4a13 100755 (executable)
--- a/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot
+++ b/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 

diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare b/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare
index 500928279a95aaaa5753e2f0b33463d19dfb6122..22e1f8ee3ede8514f138fdf7fab824944d8f8f47 100755 (executable)
--- a/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare
+++ b/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 

diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot
index b0dac40d1ce91bad487cce6307ccc860e3d34b9d..1665d7eba3f4f4b01dbaf5d2c61e486a9a3f609a 100755 (executable)
--- a/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot
+++ b/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 

diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare b/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare
index 4118e2e59fcc6398ebe239d1468108ca7b9f82ea..67557aba686d6cfbfb18cda60c7c7f7ede5e10a9 100755 (executable)
--- a/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare
+++ b/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 

diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot
index 24226ee7c8057d0b4f73f7a459bb645475bce738..02d4c3e5cb9cff052ab4ac30d88bc12f704ca34e 100755 (executable)
--- a/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot
+++ b/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 

diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare b/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare
index 86852a588ae0d02a25b681aac0a6f87186d54077..7559dc889ffdfea3fefae147ef8f2f1c6f34228a 100755 (executable)
--- a/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare
+++ b/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 

diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
index efbc4670dcf50b38b03b05c5ba4f6629ca36e0e7..6adec4ce72ce7369478d03425aa5e0a6103c580b 100755 (executable)
--- a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
+++ b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 

diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare
index 1090f4818f54c1282dbb47641b4405d82d955062..9041190e2f83ad904be410651e290a7298b2bdf8 100755 (executable)
--- a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare
+++ b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 

diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/shutdown b/mkosi/mkosi.images/initrd/mkosi.extra/shutdown
index e4c60871e832c7eb925289e0bdf6dcde348bb05c..2b3744e420fb3f313b268d1d22dddf27955e6ba5 100755 (executable)
--- a/mkosi/mkosi.images/initrd/mkosi.extra/shutdown
+++ b/mkosi/mkosi.images/initrd/mkosi.extra/shutdown
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -eux
 

diff --git a/mkosi/mkosi.images/minimal-base/mkosi.postinst b/mkosi/mkosi.images/minimal-base/mkosi.postinst
index 475f40fdc0c35ed88854af4840f6de36a2e3f5ef..6feaebc19a33fca1a4cd818641165f6ce0b7fc6a 100755 (executable)
--- a/mkosi/mkosi.images/minimal-base/mkosi.postinst
+++ b/mkosi/mkosi.images/minimal-base/mkosi.postinst
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # We don't use mkosi.extra because /usr/sbin could be a symlink and cp doesn't handle that properly until
@@ -6,7 +6,7 @@ set -e
 mkdir -p "$BUILDROOT/sbin"
 rm -f "$BUILDROOT/sbin/init"
 cat >"$BUILDROOT/sbin/init" <<EOF
-#!/bin/bash
+#!/usr/bin/env bash
 echo "Hello from dummy init, beautiful day, innit?"
 ip link
 EOF

diff --git a/mkosi/mkosi.postinst.chroot b/mkosi/mkosi.postinst.chroot
index 2251f00850884599d7761173d081d6881b12ca33..eb6d9170252a304f723d92d45c0f99ddcc57cbbc 100755 (executable)
--- a/mkosi/mkosi.postinst.chroot
+++ b/mkosi/mkosi.postinst.chroot
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 set -o nounset

diff --git a/mkosi/mkosi.sanitizers/mkosi.postinst b/mkosi/mkosi.sanitizers/mkosi.postinst
index ed936f447055296d05a7c3206c58f12180cf89de..0b1a40dddbc0ca6518de0bdd5acd8b4998216206 100755 (executable)
--- a/mkosi/mkosi.sanitizers/mkosi.postinst
+++ b/mkosi/mkosi.sanitizers/mkosi.postinst
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 set -o nounset

diff --git a/mkosi/mkosi.sync b/mkosi/mkosi.sync
index 82c575a2fc9b10d18190210e14334beadd313fd0..5ba3944595691dcd5824792e51ae09594422ccbb 100755 (executable)
--- a/mkosi/mkosi.sync
+++ b/mkosi/mkosi.sync
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 set -o nounset