alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-19 14:26:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

export.fish: Remove source check

Browse Source 
This prevents starting a new shell with the IDF environment like this:

    env IDF_PATH=/my/idf/path fish -C 'source "$IDF_PATH"/export.fish'

as `status current-command` returns `fish` in this case, but this check expects
`source`.

This check does nothing anyway, as you can't even execute that file even if it
was marked executable, as fish rejects files without a shebang, and it's not
valid bash.

Closes https://github.com/espressif/esp-idf/pull/5860
This commit is contained in:
Kelvie Wong 2020-09-13 14:32:28 -07:00 committed by Ivan Grokhotkov
parent 77b03ff800
commit 9a79de3659
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
export.fish
View File

@ -1,15 +1,6 @@
# This script should be sourced, not executed.
function idf_export_main
# The file doesn't have executable permissions, so this shouldn't really happen.
# Doing this in case someone tries to chmod +x it and execute...
set cmd (status current-command)
if test $cmd != source -a $cmd != .
echo "his script should be sourced, not executed:"
echo . (realpath (status --current-filename)/..)
return 1
end
if not set -q IDF_PATH
echo "IDF_PATH must be set before sourcing this script"
return 1
@ -72,4 +63,4 @@ end
idf_export_main
set -e idf_export_main
set -e idf_export_main