Unverified Commit 4e0a2960 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

feat: Display extraction progress (#1511)

parent c3ba25bf

src/install.sh

+8 −0
Original line number Diff line number Diff line
@@ -460,11 +460,15 @@ extractImage() { 
  fi



  rm -rf "$dir"

  /run/progress.sh "$dir" "$size" "$msg ([P])..." &



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

    fKill "progress.sh"

    error "Failed to extract ISO file: $iso" && return 1

  fi



  fKill "progress.sh"



  if [[ "${UNPACK:-}" != [Yy1]* ]]; then



    LABEL=$(isoinfo -d -i "$iso" | sed -n 's/Volume id: //p')
@@ -1095,6 +1099,8 @@ buildImage() { 
    error "Not enough free space in $STORAGE, have $space_gb available but need at least $size_gb." && return 1

  fi



  /run/progress.sh "$out" "$size" "$msg ([P])..." &



  if [[ "${BOOT_MODE,,}" != "windows_legacy" ]]; then



    genisoimage -o "$out" -b "$ETFS" -no-emul-boot -c "$cat" -iso-level 4 -J -l -D -N -joliet-long -relaxed-filenames -V "${LABEL::30}" \
@@ -1115,6 +1121,8 @@ buildImage() { 


  fi



  fKill "progress.sh"



  if [ -n "$failed" ]; then

    [ -s "$log" ] && echo "$(<"$log")"

    error "Failed to build image!" && return 1