From dfe232533f73f2e23fd451002a8b6d694b18f30b Mon Sep 17 00:00:00 2001 From: Sirius902 <10891979+Sirius902@users.noreply.github.com> Date: Tue, 28 Jan 2025 15:45:56 -0800 Subject: [PATCH] Fix /bin/bash -> /usr/bin/env bash (#2448) * Fix /bin/bash -> /usr/bin/env bash * Add curl to docker container --- Dockerfile | 1 + Makefile | 2 +- tools/disasm/do_disasm.sh | 2 +- tools/generate_patch_from_jenkins.sh | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 131ed20f1b..92a0729960 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone & python3-pip \ python3-venv \ git \ + curl \ wget \ unzip \ clang-tidy \ diff --git a/Makefile b/Makefile index afab22fee1..ba6fd8f27e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ MAKEFLAGS += --no-builtin-rules # Ensure the build fails if a piped command fails -SHELL = /bin/bash +SHELL = /usr/bin/env bash .SHELLFLAGS = -o pipefail -c #### Build options #### diff --git a/tools/disasm/do_disasm.sh b/tools/disasm/do_disasm.sh index 0c7c5e9cc8..e76a33df9b 100755 --- a/tools/disasm/do_disasm.sh +++ b/tools/disasm/do_disasm.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eu -o pipefail if [ "${VERBOSE-}" ] diff --git a/tools/generate_patch_from_jenkins.sh b/tools/generate_patch_from_jenkins.sh index 4eb98cd3af..0965015ccb 100755 --- a/tools/generate_patch_from_jenkins.sh +++ b/tools/generate_patch_from_jenkins.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail PATCH=$(git diff | base64 -w 0)