espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(tools): Remove PATH duplicity from first call of tools/activate.py

Browse Source
This commit is contained in:
Marek Fiala
2025-02-19 15:23:45 +01:00
parent 0cace3827b
commit 8180dd00ab
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/export_utils/shell_types.py
View File

@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
import getpass import getpass
import os import os
@@ -143,7 +143,6 @@ class BashShell(UnixShell):
def spawn(self) -> None: def spawn(self) -> None:
self.init_file() self.init_file()
new_env = os.environ.copy() new_env = os.environ.copy()
new_env.update(self.expanded_env())
run([self.shell, '--init-file', str(self.script_file_path)], env=new_env) run([self.shell, '--init-file', str(self.script_file_path)], env=new_env)
@@ -188,7 +187,6 @@ class ZshShell(UnixShell):
shutil.copy(str(self.script_file_path), str(zshrc_path)) shutil.copy(str(self.script_file_path), str(zshrc_path))
new_env = os.environ.copy() new_env = os.environ.copy()
new_env.update(self.expanded_env())
# Set new ZDOTDIR in the new environment # Set new ZDOTDIR in the new environment
new_env['ZDOTDIR'] = str(tmpdir_path) new_env['ZDOTDIR'] = str(tmpdir_path)
@@ -216,7 +214,6 @@ class FishShell(UnixShell):
def spawn(self) -> None: def spawn(self) -> None:
self.init_file() self.init_file()
new_env = os.environ.copy() new_env = os.environ.copy()
new_env.update(self.expanded_env())
run([self.shell, f'--init-command=source {self.script_file_path}'], env=new_env) run([self.shell, f'--init-command=source {self.script_file_path}'], env=new_env)
@@ -262,7 +259,6 @@ class PowerShell(Shell):
def spawn(self) -> None: def spawn(self) -> None:
self.init_file() self.init_file()
new_env = os.environ.copy() new_env = os.environ.copy()
new_env.update(self.expanded_env())
arguments = ['-NoExit', '-Command', f'{self.script_file_path}'] arguments = ['-NoExit', '-Command', f'{self.script_file_path}']
cmd: Union[str, List[str]] = [self.shell] + arguments cmd: Union[str, List[str]] = [self.shell] + arguments
run(cmd, env=new_env) run(cmd, env=new_env)
@@ -315,7 +311,6 @@ class WinCmd(Shell):
def spawn(self) -> None: def spawn(self) -> None:
self.init_file() self.init_file()
new_env = os.environ.copy() new_env = os.environ.copy()
new_env.update(self.expanded_env())
arguments = ['/k', f'{self.script_file_path}'] arguments = ['/k', f'{self.script_file_path}']
cmd: Union[str, List[str]] = [self.shell] + arguments cmd: Union[str, List[str]] = [self.shell] + arguments
cmd = ' '.join(cmd) cmd = ' '.join(cmd)