mirror of
https://github.com/zeldaret/oot.git
synced 2025-02-13 17:07:44 +00:00
Fix /bin/bash -> /usr/bin/env bash (#2448)
* Fix /bin/bash -> /usr/bin/env bash * Add curl to docker container
This commit is contained in:
parent
b0c713b2bc
commit
dfe232533f
4 changed files with 4 additions and 3 deletions
|
@ -13,6 +13,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone &
|
||||||
python3-pip \
|
python3-pip \
|
||||||
python3-venv \
|
python3-venv \
|
||||||
git \
|
git \
|
||||||
|
curl \
|
||||||
wget \
|
wget \
|
||||||
unzip \
|
unzip \
|
||||||
clang-tidy \
|
clang-tidy \
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -1,7 +1,7 @@
|
||||||
MAKEFLAGS += --no-builtin-rules
|
MAKEFLAGS += --no-builtin-rules
|
||||||
|
|
||||||
# Ensure the build fails if a piped command fails
|
# Ensure the build fails if a piped command fails
|
||||||
SHELL = /bin/bash
|
SHELL = /usr/bin/env bash
|
||||||
.SHELLFLAGS = -o pipefail -c
|
.SHELLFLAGS = -o pipefail -c
|
||||||
|
|
||||||
#### Build options ####
|
#### Build options ####
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/bash
|
#!/usr/bin/env bash
|
||||||
set -eu -o pipefail
|
set -eu -o pipefail
|
||||||
|
|
||||||
if [ "${VERBOSE-}" ]
|
if [ "${VERBOSE-}" ]
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
PATCH=$(git diff | base64 -w 0)
|
PATCH=$(git diff | base64 -w 0)
|
||||||
|
|
Loading…
Add table
Reference in a new issue