From 44107e8e78a4f50180cae55386c31b330294ccdf Mon Sep 17 00:00:00 2001 From: Emil Nikolov Date: Sun, 4 Feb 2024 18:54:17 +0100 Subject: [PATCH] Replace references to /bin/bash with /usr/bin/env bash (#4478) --- Makefile.envs | 2 +- packages/libf2c/extras/make.inc | 2 +- packages/opencv-python/extras/build_args.sh | 2 +- pyodide-build/pyodide_build/out_of_tree/venv.py | 2 +- pyodide_env.sh | 2 +- src/templates/python | 2 +- tools/buildf2c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.envs b/Makefile.envs index 3617bd738..187da5b78 100644 --- a/Makefile.envs +++ b/Makefile.envs @@ -14,7 +14,7 @@ export SYSCONFIG_NAME=_sysconfigdata_$(CPYTHON_ABI_FLAGS)_emscripten_$(PLATFORM_ # environment variables. The next line instructs make to use bash to run each # command. export BASH_ENV := $(PYODIDE_ROOT)/pyodide_env.sh -SHELL := /bin/bash +SHELL := /usr/bin/env bash version_tmp_1 := $(subst ., ,$(PYVERSION:v%=%)) # Handle alpha, beta, and release candidate versions diff --git a/packages/libf2c/extras/make.inc b/packages/libf2c/extras/make.inc index 90ce6523e..7eaae7b5f 100644 --- a/packages/libf2c/extras/make.inc +++ b/packages/libf2c/extras/make.inc @@ -7,7 +7,7 @@ # # See the INSTALL/ directory for more examples. # -SHELL = /bin/sh +SHELL = /usr/bin/env sh # # The machine (platform) identifier to append to the library names # diff --git a/packages/opencv-python/extras/build_args.sh b/packages/opencv-python/extras/build_args.sh index 4cc9eaf1c..0a70ae45f 100755 --- a/packages/opencv-python/extras/build_args.sh +++ b/packages/opencv-python/extras/build_args.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash export CMAKE_ARGS=" \ -DPYTHON3_INCLUDE_PATH=$PYTHONINCLUDE \ diff --git a/pyodide-build/pyodide_build/out_of_tree/venv.py b/pyodide-build/pyodide_build/out_of_tree/venv.py index 6e441afbd..810a1c247 100644 --- a/pyodide-build/pyodide_build/out_of_tree/venv.py +++ b/pyodide-build/pyodide_build/out_of_tree/venv.py @@ -192,7 +192,7 @@ def create_pyodide_script(venv_bin: Path) -> None: pyodide_path.write_text( dedent( f""" - #!/bin/sh + #!/usr/bin/env bash PATH="{PATH}:$PATH" PYODIDE_ROOT='{PYODIDE_ROOT}' exec {original_pyodide_cli} "$@" """ ) diff --git a/pyodide_env.sh b/pyodide_env.sh index 9659b221a..2a6e6d60a 100755 --- a/pyodide_env.sh +++ b/pyodide_env.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # get the absolute path of the root folder # shellcheck disable=SC2164 diff --git a/src/templates/python b/src/templates/python index 59926ff2a..2cf54800c 100755 --- a/src/templates/python +++ b/src/templates/python @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ":" /* << "EOF" This file is a bash/node polyglot. This is needed for a few reasons: diff --git a/tools/buildf2c b/tools/buildf2c index 6849ee76e..314174010 100755 --- a/tools/buildf2c +++ b/tools/buildf2c @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Based on http://hpc.sourceforge.net/buildf2c with curl replaced by wget