Zengtudor/windows_in_docker
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2024-11-21 12:35:07 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: Delete ISO when extraction fails (#372)

Browse Source
This commit is contained in:
Kroese 2024-04-13 16:58:04 +02:00 committed by GitHub
parent da9ef0e061
commit 56cb787c55
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.dockerignore
View File

@ -6,6 +6,8 @@
.gitmodules .gitmodules
Dockerfile Dockerfile
Dockerfile.archive Dockerfile.archive
compose.yml
compose.yaml
docker-compose.yml docker-compose.yml
docker-compose.yaml
*.md *.md

7
src/install.sh
View File

@ -316,6 +316,7 @@ startInstall() {
fi fi
rm -rf "$TMP"
mkdir -p "$TMP" mkdir -p "$TMP"
if [ ! -f "$STORAGE/$CUSTOM" ]; then if [ ! -f "$STORAGE/$CUSTOM" ]; then
@ -325,7 +326,6 @@ startInstall() {
ISO="$STORAGE/$CUSTOM" ISO="$STORAGE/$CUSTOM"
fi fi
rm -f "$TMP/$BASE"
return 0 return 0
} }
@ -445,6 +445,9 @@ downloadImage() {
info "Failed to download $desc using Mido, will try a different method now..." info "Failed to download $desc using Mido, will try a different method now..."
rm -rf "$TMP"
mkdir -p "$TMP"
ISO="$TMP/$VERSION.esd" ISO="$TMP/$VERSION.esd"
iso="$ISO" iso="$ISO"
file="$ISO" file="$ISO"
@ -573,6 +576,7 @@ extractImage() {
if [[ "${iso,,}" == *".esd" ]]; then if [[ "${iso,,}" == *".esd" ]]; then
if ! extractESD "$iso" "$dir"; then if ! extractESD "$iso" "$dir"; then
rm -f "$iso"
error "Failed to extract ESD file!" error "Failed to extract ESD file!"
exit 67 exit 67
fi fi
@ -604,6 +608,7 @@ extractImage() {
rm -rf "$dir" rm -rf "$dir"
if ! 7z x "$iso" -o"$dir" > /dev/null; then if ! 7z x "$iso" -o"$dir" > /dev/null; then
rm -f "$iso"
error "Failed to extract ISO file!" error "Failed to extract ISO file!"
exit 66 exit 66
fi fi