diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2020-03-04 09:35:06 +0000 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-03-05 17:27:07 +0100 |
commit | ff12a7954c1993dd1f38d49052e79bb245d75dc4 (patch) | |
tree | e82e13efe903b28a33862f2f95c1dbf0c4d451c6 /test/TEST-20-MAINPIDGAMES | |
parent | eda0cbf07186d16a160bd1d810613586fdbdf587 (diff) | |
download | systemd-ff12a7954c1993dd1f38d49052e79bb245d75dc4.tar.gz |
treewide: more portable bash shebangs
As in 2a5fcfae024ffc370bb780572279f45a1da3f946
and in 3e67e5c9928f8b1e1c5a63def88d53ed1fed12eb
using /usr/bin/env allows bash to be looked up in PATH
rather than being hard-coded.
As with the previous changes the same arguments apply
- distributions have scripts to rewrite shebangs on installation and
they know what locations to rely on.
- For tests/compilation we should rather rely on the user to have setup
there PATH correctly.
In particular this makes testing from git easier on NixOS where do not provide
/bin/bash to improve compose-ability.
Diffstat (limited to 'test/TEST-20-MAINPIDGAMES')
-rwxr-xr-x | test/TEST-20-MAINPIDGAMES/test.sh | 2 | ||||
-rwxr-xr-x | test/TEST-20-MAINPIDGAMES/testsuite.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/TEST-20-MAINPIDGAMES/test.sh b/test/TEST-20-MAINPIDGAMES/test.sh index 05fa847a65..4cf1b79f9a 100755 --- a/test/TEST-20-MAINPIDGAMES/test.sh +++ b/test/TEST-20-MAINPIDGAMES/test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e TEST_DESCRIPTION="test changing main PID" diff --git a/test/TEST-20-MAINPIDGAMES/testsuite.sh b/test/TEST-20-MAINPIDGAMES/testsuite.sh index 904ac0e3b8..f894026070 100755 --- a/test/TEST-20-MAINPIDGAMES/testsuite.sh +++ b/test/TEST-20-MAINPIDGAMES/testsuite.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -ex set -o pipefail @@ -55,7 +55,7 @@ systemd-notify --uid=1000 MAINPID=$$ test `systemctl show -p MainPID --value testsuite.service` -eq $$ cat >/tmp/mainpid.sh <<EOF -#!/bin/bash +#!/usr/bin/env bash set -eux set -o pipefail @@ -79,7 +79,7 @@ systemd-run --unit=mainpidsh.service -p StandardOutput=tty -p StandardError=tty test `systemctl show -p MainPID --value mainpidsh.service` -eq `cat /run/mainpidsh/pid` cat >/tmp/mainpid2.sh <<EOF -#!/bin/bash +#!/usr/bin/env bash set -eux set -o pipefail @@ -104,7 +104,7 @@ systemd-run --unit=mainpidsh2.service -p StandardOutput=tty -p StandardError=tty test `systemctl show -p MainPID --value mainpidsh2.service` -eq `cat /run/mainpidsh2/pid` cat >/dev/shm/mainpid3.sh <<EOF -#!/bin/bash +#!/usr/bin/env bash set -eux set -o pipefail |