feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'feature/fish_idf_default_path' into 'master'

Browse Source 
Tools: Add default IDF_PATH detection to export.fish

Closes IDFGH-5028

See merge request espressif/esp-idf!18635
This commit is contained in:
Roland Dobai
2022-06-26 23:36:51 +08:00
parent 3d0829af1e d558b511da
commit 7b19ead826
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
export.fish
View File

@@ -7,8 +7,8 @@ end
function __main function __main
if not set -q IDF_PATH if not set -q IDF_PATH
echo "IDF_PATH must be set before sourcing this script" set -gx IDF_PATH (cd (dirname (status -f)); and pwd)
return 1 echo "Setting IDF_PATH to '$IDF_PATH'"
end end
set script_dir (cd (dirname (status -f)); and pwd) set script_dir (cd (dirname (status -f)); and pwd)
@@ -36,8 +36,8 @@ function __main
echo "Adding ESP-IDF tools to PATH..." echo "Adding ESP-IDF tools to PATH..."
# Call idf_tools.py to export tool paths # Call idf_tools.py to export tool paths
set -x IDF_TOOLS_EXPORT_CMD "$IDF_PATH"/export.fish set -gx IDF_TOOLS_EXPORT_CMD "$IDF_PATH"/export.fish
set -x IDF_TOOLS_INSTALL_CMD "$IDF_PATH"/install.fish set -gx IDF_TOOLS_INSTALL_CMD "$IDF_PATH"/install.fish
# Allow calling some IDF python tools without specifying the full path # Allow calling some IDF python tools without specifying the full path
# "$IDF_PATH"/tools is already added by 'idf_tools.py export' # "$IDF_PATH"/tools is already added by 'idf_tools.py export'
set IDF_ADD_PATHS_EXTRAS "$IDF_PATH"/components/esptool_py/esptool set IDF_ADD_PATHS_EXTRAS "$IDF_PATH"/components/esptool_py/esptool