From a4e6f19a3361fdd0abf0cf03cb9ccb3e57a5a053 Mon Sep 17 00:00:00 2001
From: Sumner Evans <me@sumnerevans.com>
Date: Mon, 23 Aug 2021 14:35:19 -0600
Subject: [PATCH] /bin/sh -> /usr/bin/env sh

Better compatibility with NixOS
---
 cicd/create-pypirc.sh               | 2 +-
 cicd/install-project-deps.sh        | 3 ++-
 cicd/publish-gitlab-release.sh      | 2 +-
 cicd/pytest.sh                      | 2 +-
 cicd/python-build/install-python.sh | 3 ++-
 cicd/start-dbus.sh                  | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cicd/create-pypirc.sh b/cicd/create-pypirc.sh
index 2fe3c15..36f1be8 100755
--- a/cicd/create-pypirc.sh
+++ b/cicd/create-pypirc.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /usr/bin/env sh
 
 echo "[distutils]" >> ~/.pypirc
 echo "index-servers =" >> ~/.pypirc
diff --git a/cicd/install-project-deps.sh b/cicd/install-project-deps.sh
index 72d7141..882dd2b 100755
--- a/cicd/install-project-deps.sh
+++ b/cicd/install-project-deps.sh
@@ -1,4 +1,5 @@
-#! /bin/sh
+#! /usr/bin/env sh
+
 export PYENV_ROOT="${HOME}/.pyenv"
 export PATH="${PYENV_ROOT}/bin:$PATH"
 eval "$(pyenv init -)"
diff --git a/cicd/publish-gitlab-release.sh b/cicd/publish-gitlab-release.sh
index 9e1fbaf..9f9c494 100755
--- a/cicd/publish-gitlab-release.sh
+++ b/cicd/publish-gitlab-release.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 
 set -e
 
diff --git a/cicd/pytest.sh b/cicd/pytest.sh
index 8ae4f5d..15d958f 100755
--- a/cicd/pytest.sh
+++ b/cicd/pytest.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /usr/bin/env sh
 
 pytest
 ec=$?
diff --git a/cicd/python-build/install-python.sh b/cicd/python-build/install-python.sh
index 857a3d0..4c588af 100755
--- a/cicd/python-build/install-python.sh
+++ b/cicd/python-build/install-python.sh
@@ -1,4 +1,5 @@
-#! /bin/sh
+#! /usr/bin/env sh
+
 export PYENV_ROOT="${HOME}/.pyenv"
 export PATH="${PYENV_ROOT}/bin:$PATH"
 eval "$(pyenv init -)"
diff --git a/cicd/start-dbus.sh b/cicd/start-dbus.sh
index c29dfdd..6253aa3 100755
--- a/cicd/start-dbus.sh
+++ b/cicd/start-dbus.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /usr/bin/env sh
 # Technique from https://georgik.rocks/how-to-start-d-bus-in-docker-container/
 
 dbus-uuidgen > /var/lib/dbus/machine-id