aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild-aux/assert-shellcheck.sh5
-rwxr-xr-xbuild-aux/assert-todos.sh3
-rwxr-xr-xbuild-aux/ci/ci-build.sh3
-rwxr-xr-xbuild-aux/ci/git-post-receive.sh3
-rw-r--r--build-aux/ci/git-pre-push.sh.in3
-rwxr-xr-xbuild-aux/with-container.sh3
-rwxr-xr-xbuild-aux/workflow/TODOs.sh3
7 files changed, 15 insertions, 8 deletions
diff --git a/build-aux/assert-shellcheck.sh b/build-aux/assert-shellcheck.sh
index d07815b..334a875 100755
--- a/build-aux/assert-shellcheck.sh
+++ b/build-aux/assert-shellcheck.sh
@@ -1,5 +1,6 @@
-#!/bin/sh -eux
+#!/bin/sh
+set -eux
git ls-files -z | \
- xargs -0 awk 'FNR==1 && /^#!\/bin\/sh/ { print FILENAME }' | \
+ xargs -0 awk 'FNR==1 && /^#!\/bin\/sh$/ { print FILENAME }' | \
xargs shellcheck
diff --git a/build-aux/assert-todos.sh b/build-aux/assert-todos.sh
index ce6c95b..91015fe 100755
--- a/build-aux/assert-todos.sh
+++ b/build-aux/assert-todos.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
if git grep FIXME | grep -v '^TODOs.md' | grep -v '^build-aux/assert-todos.sh' | grep -v '^build-aux/docbook-xsl/'; then
echo "Found dangling FIXME markers on the project."
diff --git a/build-aux/ci/ci-build.sh b/build-aux/ci/ci-build.sh
index 62e0f22..93c9ee1 100755
--- a/build-aux/ci/ci-build.sh
+++ b/build-aux/ci/ci-build.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eux
+#!/bin/sh
+set -eux
PACKAGE="$1"
LOGS_DIR="$2"
diff --git a/build-aux/ci/git-post-receive.sh b/build-aux/ci/git-post-receive.sh
index c78f1ac..2f6e3c0 100755
--- a/build-aux/ci/git-post-receive.sh
+++ b/build-aux/ci/git-post-receive.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
for n in $(seq 0 $((GIT_PUSH_OPTION_COUNT - 1))); do
opt="$(eval "echo \$GIT_PUSH_OPTION_$n")"
diff --git a/build-aux/ci/git-pre-push.sh.in b/build-aux/ci/git-pre-push.sh.in
index 37e777c..16428d6 100644
--- a/build-aux/ci/git-pre-push.sh.in
+++ b/build-aux/ci/git-pre-push.sh.in
@@ -1,4 +1,5 @@
-#!/bin/sh -eux
+#!/bin/sh
+set -eux
PACKAGE="$(basename "$PWD")"
LOGS_DIR="/data/ci/$PACKAGE/logs"
diff --git a/build-aux/with-container.sh b/build-aux/with-container.sh
index cff282f..5544d8e 100755
--- a/build-aux/with-container.sh
+++ b/build-aux/with-container.sh
@@ -1,3 +1,4 @@
-#!/bin/sh -eux
+#!/bin/sh
+set -eux
guix time-machine -C guix/pinned-channels.scm -- environment --pure -C -m guix/manifest.scm -- sh -c "$@"
diff --git a/build-aux/workflow/TODOs.sh b/build-aux/workflow/TODOs.sh
index 58fbd3c..4a9eb65 100755
--- a/build-aux/workflow/TODOs.sh
+++ b/build-aux/workflow/TODOs.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
mkdir -p public