Skip to content

Commit

Permalink
Tools: Fix export.sh failure if python is unavailable
Browse files Browse the repository at this point in the history
In the latest release of macOS (and probable some other recent *nixes as well?) `python` is no longer available by default, only `python3`. This causes `export.sh` to fail as it still had a reference to plain `python`. This now works as expected.

Merges #9749
  • Loading branch information
gormster authored and dobairoland committed Sep 14, 2022
1 parent 4d8a026 commit 20487e7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion export.fish
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function __main
set -x PATH "$IDF_ADD_PATHS_EXTRAS":"$PATH"

echo "Checking if Python packages are up to date..."
python "$IDF_PATH"/tools/idf_tools.py check-python-dependencies || return 1
"$ESP_PYTHON" "$IDF_PATH"/tools/idf_tools.py check-python-dependencies || return 1

set added_path_variables
for entry in $PATH;
Expand Down
3 changes: 1 addition & 2 deletions export.sh
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,8 @@ __main() {
eval "${idf_exports}"
export PATH="${IDF_ADD_PATHS_EXTRAS}:${PATH}"

__verbose "Using Python interpreter in $(which python)"
__verbose "Checking if Python packages are up to date..."
python "${IDF_PATH}/tools/idf_tools.py" check-python-dependencies || return 1
"$ESP_PYTHON" "${IDF_PATH}/tools/idf_tools.py" check-python-dependencies || return 1

if [ -n "$BASH" ]
then
Expand Down

0 comments on commit 20487e7

Please sign in to comment.