alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(tools): do not include rc scripts in export script

Browse Source 
The rc scripts should be included only when a new shell is started. At
present, for bash and zsh, we are also including them in the export
scripts, which is incorrect and may cause recursion.

Closes https://github.com/espressif/esp-idf/issues/14584

Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
This commit is contained in:
Frantisek Hrbata 2024-09-17 09:34:32 +02:00 committed by Marek Fiala
parent eb606b9777
commit 2109f81102
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/export_utils/shell_types.py
View File

@ -72,10 +72,6 @@ class UnixShell(Shell):
# Basic POSIX shells does not support autocompletion # Basic POSIX shells does not support autocompletion
return None return None
def init_file(self) -> None:
with open(self.script_file_path, 'w') as fd:
self.export_file(fd)
def export_file(self, fd: TextIO) -> None: def export_file(self, fd: TextIO) -> None:
fd.write(f'{self.deactivate_cmd}\n') fd.write(f'{self.deactivate_cmd}\n')
for var, value in self.new_esp_idf_env.items(): for var, value in self.new_esp_idf_env.items():
@ -87,7 +83,8 @@ class UnixShell(Shell):
'Go to the project directory and run:\n\n idf.py build"\n')) 'Go to the project directory and run:\n\n idf.py build"\n'))
def export(self) -> None: def export(self) -> None:
self.init_file() with open(self.script_file_path, 'w') as fd:
self.export_file(fd)
print(f'. {self.script_file_path}') print(f'. {self.script_file_path}')
def click_ver(self) -> int: def click_ver(self) -> int:
@ -188,6 +185,10 @@ class FishShell(UnixShell):
stdout: str = run_cmd([sys.executable, conf.IDF_PY], env=env) stdout: str = run_cmd([sys.executable, conf.IDF_PY], env=env)
return stdout return stdout
def init_file(self) -> None:
with open(self.script_file_path, 'w') as fd:
self.export_file(fd)
def spawn(self) -> None: def spawn(self) -> None:
self.init_file() self.init_file()
new_env = os.environ.copy() new_env = os.environ.copy()