From 6f98940189e6147eb16a862bfd459010518ecf2a Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Mon, 28 Mar 2022 16:43:47 -0600 Subject: [PATCH] Switch to using env to find the path to bash. Systems like OpenBSD and NixOS have bash in different locations. This allows the various scripts to be run on those systems. --- buildpush.sh | 2 +- imports/riscv-0.5.6/assemble.sh | 2 +- imports/riscv-0.5.6/check-blobs.sh | 2 +- kernel/assemble.sh | 2 +- loader/assemble.sh | 2 +- tools/factory_reset.sh | 2 +- tools/update_ci.sh | 2 +- tools/upload_audiotest.sh | 2 +- xous-rs/assemble.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/buildpush.sh b/buildpush.sh index 416f50c68..8b1504559 100755 --- a/buildpush.sh +++ b/buildpush.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e # exit on any error diff --git a/imports/riscv-0.5.6/assemble.sh b/imports/riscv-0.5.6/assemble.sh index 8c6388488..f08f1d6c3 100644 --- a/imports/riscv-0.5.6/assemble.sh +++ b/imports/riscv-0.5.6/assemble.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euxo pipefail diff --git a/imports/riscv-0.5.6/check-blobs.sh b/imports/riscv-0.5.6/check-blobs.sh index 36d885e6e..9c49c2221 100644 --- a/imports/riscv-0.5.6/check-blobs.sh +++ b/imports/riscv-0.5.6/check-blobs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Checks that the blobs are up to date with the committed assembly files diff --git a/kernel/assemble.sh b/kernel/assemble.sh index 28c5ccc25..80c9139d0 100755 --- a/kernel/assemble.sh +++ b/kernel/assemble.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # SPDX-FileCopyrightText: 2020 Sean Cross # SPDX-License-Identifier: Apache-2.0 diff --git a/loader/assemble.sh b/loader/assemble.sh index 5e305f861..62e2a7d13 100755 --- a/loader/assemble.sh +++ b/loader/assemble.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euxo pipefail diff --git a/tools/factory_reset.sh b/tools/factory_reset.sh index 8fc13ec07..bec0c0473 100755 --- a/tools/factory_reset.sh +++ b/tools/factory_reset.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e # populate with an invalid default so the equals compares work downstream diff --git a/tools/update_ci.sh b/tools/update_ci.sh index 2e27b26f9..a4e77c00b 100755 --- a/tools/update_ci.sh +++ b/tools/update_ci.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e # populate with an invalid default so the equals compares work downstream diff --git a/tools/upload_audiotest.sh b/tools/upload_audiotest.sh index 60655c797..f11f4ea1f 100755 --- a/tools/upload_audiotest.sh +++ b/tools/upload_audiotest.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash SHORT8=short_8khz.wav SHORTCD=short_cd.wav diff --git a/xous-rs/assemble.sh b/xous-rs/assemble.sh index 5e305f861..62e2a7d13 100644 --- a/xous-rs/assemble.sh +++ b/xous-rs/assemble.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euxo pipefail