diff --git a/Dockerfile b/Dockerfile index 4a9c7a33c..3f6da48bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG VERSION_ARG="latest" FROM scratch AS build-amd64 -COPY --from=qemux/qemu-docker:6.11 / / +COPY --from=qemux/qemu-docker:6.12 / / ARG DEBCONF_NOWARNINGS="yes" ARG DEBIAN_FRONTEND="noninteractive" @@ -29,7 +29,7 @@ RUN set -eu && \ COPY --chmod=755 ./src /run/ COPY --chmod=755 ./assets /run/assets -ADD --chmod=664 https://github.com/qemus/virtiso-whql/releases/download/v1.9.43-0/virtio-win-1.9.43.tar.xz /drivers.txz +ADD --chmod=664 https://github.com/qemus/virtiso-whql/releases/download/v1.9.44-0/virtio-win-1.9.44.tar.xz /drivers.txz FROM dockurr/windows-arm:${VERSION_ARG} AS build-arm64 FROM build-${TARGETARCH} diff --git a/src/define.sh b/src/define.sh index ef93d412e..a24524842 100644 --- a/src/define.sh +++ b/src/define.sh @@ -502,7 +502,10 @@ fromFile() { local file="${1,,}" local arch="${PLATFORM,,}" - case "${file// /_}" in + file="${file//-/_}" + file="${file// /_}" + + case "$file" in *"_x64_"* | *"_x64."*) arch="x64" ;; @@ -517,7 +520,7 @@ fromFile() { local add="" [[ "$arch" != "x64" ]] && add="$arch" - case "${file// /_}" in + case "$file" in "win7"* | "win_7"* | *"windows7"* | *"windows_7"* ) id="win7${arch}" ;; diff --git a/src/mido.sh b/src/mido.sh index 4804390f9..e03c9f52d 100644 --- a/src/mido.sh +++ b/src/mido.sh @@ -620,10 +620,11 @@ getMG() { } local list="" - list=$(echo "$body" | grep -Eo "(http|https)://[a-zA-Z0-9./?=_%:-]*" | grep -i '\.iso$') + list=$(echo "$body" | xmllint --html --nonet --xpath "//a[contains(text(), '.iso')]" - 2>/dev/null) local result="" result=$(echo "$list" | grep -i "${platform}" | grep "${pattern}" | grep -i -m 1 "${locale,,}_") + result=$(echo "$result" | sed -r 's/.*href="([^"]+).*/\1/g') if [ -z "$result" ]; then if [[ "${lang,,}" != "en" ]] && [[ "${lang,,}" != "en-"* ]]; then