Skip to content

Unix entry points: correctly detect the availability of a python binary #15071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 20, 2021
Merged

Unix entry points: correctly detect the availability of a python binary #15071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aafa505
Unix entry points: correctly detect the availability of a python binary
eli-schwartz Sep 20, 2021
5745d6e
regenerate entry points from template
eli-schwartz Sep 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions em++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions em-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions emar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions embuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions emcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions emcmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions emconfigure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions emdump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions emdwp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions emmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions emnm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions emprofile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions emranlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions emrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions emscons
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions emsize
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions tests/runner
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions tools/file_packager
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions tools/run_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions tools/run_python_compiler.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down
4 changes: 2 additions & 2 deletions tools/webidl_binder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
PYTHON=$(command -v python3 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python 2> /dev/null)
PYTHON=$(command -v python 2> /dev/null)
fi

if [ -z "$PYTHON" ]; then
Expand Down