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

feat: Additional download mirrors (#870)

parent e292d18d

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ COPY --chmod=755 ./assets /run/assets 
ADD --chmod=755 https://raw.githubusercontent.com/christgau/wsdd/v0.8/src/wsdd.py /usr/sbin/wsdd

ADD --chmod=664 https://github.com/qemus/virtiso-whql/releases/download/v1.9.43-0/virtio-win-1.9.43.tar.xz /drivers.txz



FROM dockurr/windows-arm:2.21 AS build-arm64

FROM dockurr/windows-arm:2.22 AS build-arm64

FROM build-${TARGETARCH}



EXPOSE 8006 3389

src/define.sh

+446 −151

File changed.

Preview size limit exceeded, changes collapsed.

src/mido.sh

+30 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ getWindows() { 
  language=$(getLanguage "$lang" "desc")

  edition=$(printEdition "$version" "$desc")



  local msg="Requesting $desc from Microsoft server..."

  local msg="Requesting $desc from the Microsoft servers..."

  info "$msg" && html "$msg"



  case "${version,,}" in
@@ -610,13 +610,18 @@ downloadImage() { 
  local iso="$1"

  local version="$2"

  local lang="$3"

  local delay=5

  local tried="n"

  local success="n"

  local url sum size base desc language

  local msg="Will retry after $delay seconds..."



  if [[ "${version,,}" == "http"* ]]; then

    base=$(basename "$iso")

    desc=$(fromFile "$base")

    downloadFile "$iso" "$version" "" "" "" "$desc" && return 0

    info "$msg" && html "$msg" && sleep "$delay"

    downloadFile "$iso" "$version" "" "" "" "$desc" && return 0

    rm -f "$iso"

    return 1

  fi
@@ -637,11 +642,23 @@ downloadImage() { 
  fi



  if isMido "$version" "$lang"; then



    tried="y"

    success="n"



    if getWindows "$version" "$lang" "$desc"; then

      success="y"

    else

      info "$msg" && html "$msg" && sleep "$delay"

      getWindows "$version" "$lang" "$desc" && success="y"

    fi



    if [[ "$success" == "y" ]]; then

      size=$(getMido "$version" "$lang" "size" )

      sum=$(getMido "$version" "$lang" "sum")

      downloadFile "$iso" "$MIDO_URL" "$sum" "$size" "$lang" "$desc" && return 0

      info "$msg" && html "$msg" && sleep "$delay"

      downloadFile "$iso" "$MIDO_URL" "$sum" "$size" "$lang" "$desc" && return 0

      rm -f "$iso"

    fi

  fi
@@ -655,10 +672,20 @@ downloadImage() { 
    fi



    tried="y"

    success="n"



    if getESD "$TMP/esd" "$version" "$lang" "$desc"; then

      success="y"

    else

      info "$msg" && html "$msg" && sleep "$delay"

      getESD "$TMP/esd" "$version" "$lang" "$desc" && success="y"

    fi



    if [[ "$success" == "y" ]]; then

      ISO="${ISO%.*}.esd"

      downloadFile "$ISO" "$ESD" "$ESD_SUM" "$ESD_SIZE" "$lang" "$desc" && return 0

      info "$msg" && html "$msg" && sleep "$delay"

      downloadFile "$ISO" "$ESD" "$ESD_SUM" "$ESD_SIZE" "$lang" "$desc" && return 0

      rm -f "$ISO"

      ISO="$iso"

    fi
@@ -677,6 +704,8 @@ downloadImage() { 
      size=$(getSize "$i" "$version" "$lang")

      sum=$(getHash "$i" "$version" "$lang")

      downloadFile "$iso" "$url" "$sum" "$size" "$lang" "$desc" && return 0

      info "$msg" && html "$msg" && sleep "$delay"

      downloadFile "$iso" "$url" "$sum" "$size" "$lang" "$desc" && return 0

      rm -f "$iso"

    fi