Unverified Commit 56cb787c authored by Kroese's avatar Kroese Committed by GitHub
Browse files

fix: Delete ISO when extraction fails (#372)

parent da9ef0e0

.dockerignore

+3 −1
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
.gitmodules

Dockerfile

Dockerfile.archive

compose.yml

compose.yaml

docker-compose.yml



docker-compose.yaml

*.md

src/install.sh

+6 −1
Original line number Diff line number Diff line
@@ -316,6 +316,7 @@ startInstall() { 


  fi



  rm -rf "$TMP"

  mkdir -p "$TMP"



  if [ ! -f "$STORAGE/$CUSTOM" ]; then
@@ -325,7 +326,6 @@ startInstall() { 
    ISO="$STORAGE/$CUSTOM"

  fi



  rm -f "$TMP/$BASE"

  return 0

}
@@ -445,6 +445,9 @@ downloadImage() { 


    info "Failed to download $desc using Mido, will try a different method now..."



    rm -rf "$TMP"

    mkdir -p "$TMP"



    ISO="$TMP/$VERSION.esd"

    iso="$ISO"

    file="$ISO"
@@ -573,6 +576,7 @@ extractImage() { 


  if [[ "${iso,,}" == *".esd" ]]; then

    if ! extractESD "$iso" "$dir"; then

      rm -f "$iso"

      error "Failed to extract ESD file!"

      exit 67

    fi
@@ -604,6 +608,7 @@ extractImage() { 
  rm -rf "$dir"



  if ! 7z x "$iso" -o"$dir" > /dev/null; then

    rm -f "$iso"

    error "Failed to extract ISO file!"

    exit 66

  fi