Skip to content

fix(get.py): Remove existing files before extracting #10247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 28, 2024
+5 −2
Merged

fix(get.py): Remove existing files before extracting #10247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f00177
fix(get.py): Remove existing files before extracting
lucasssvaz Aug 26, 2024
10f3fb1
change(tools): Push generated binaries to PR
github-actions[bot] Aug 26, 2024
bb5bf76
ci(pre-commit): Apply automatic fixes
pre-commit-ci-lite[bot] Aug 27, 2024
85bbcf9
change(tools): Push generated binaries to PR
github-actions[bot] Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
tools/esp32-arduino-libs
tools/xtensa-esp-elf
tools/xtensa-esp32-elf
tools/xtensa-esp32s2-elf
tools/xtensa-esp32s3-elf
Expand Down
Binary file modified tools/get.exe
View file
Open in desktop
Binary file not shown.
6 changes: 4 additions & 2 deletions tools/get.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,10 @@ def unpack(filename, destination, force_extract, checksum): # noqa: C901
else:
print(" Forcing extraction")

if os.path.isdir(os.path.join(destination, rename_to)):
print("Removing existing {0} ...".format(rename_to))
shutil.rmtree(os.path.join(destination, rename_to), ignore_errors=True)

if filename.endswith("tar.gz"):
if not cfile:
cfile = tarfile.open(filename, "r:gz")
Expand All @@ -250,8 +254,6 @@ def unpack(filename, destination, force_extract, checksum): # noqa: C901

if rename_to != dirname:
print("Renaming {0} to {1} ...".format(dirname, rename_to))
if os.path.isdir(rename_to):
shutil.rmtree(rename_to)
shutil.move(dirname, rename_to)

with open(os.path.join(destination, rename_to, ".package_checksum"), "w") as f:
Expand Down