From 20487e7a06135db993886129d6316f973f82f7b8 Mon Sep 17 00:00:00 2001 From: Morgan Harris Date: Thu, 8 Sep 2022 10:51:07 +1000 Subject: [PATCH] Tools: Fix export.sh failure if python is unavailable 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 https://github.com/espressif/esp-idf/pull/9749 --- export.fish | 2 +- export.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/export.fish b/export.fish index 755aacf0d1..8944c598ad 100644 --- a/export.fish +++ b/export.fish @@ -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; diff --git a/export.sh b/export.sh index 9eefa41549..259b1b965a 100644 --- a/export.sh +++ b/export.sh @@ -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