Compare commits

..

No commits in common. "57193b0f59f8ccb1037fda6b0b5bebc6f7be7ca0" and "c82725ec615fd3ec9358239e75fbd39a4fc45d2d" have entirely different histories.

3 changed files with 5 additions and 24 deletions

View File

@ -1,7 +1,7 @@
ARG VERSION_ARG="latest"
FROM scratch AS build-amd64
COPY --from=qemux/qemu-docker:6.12 / /
COPY --from=qemux/qemu-docker:6.11 / /
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.44-0/virtio-win-1.9.44.tar.xz /drivers.txz
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:${VERSION_ARG} AS build-arm64
FROM build-${TARGETARCH}

View File

@ -502,10 +502,7 @@ fromFile() {
local file="${1,,}"
local arch="${PLATFORM,,}"
file="${file//-/_}"
file="${file// /_}"
case "$file" in
case "${file// /_}" in
*"_x64_"* | *"_x64."*)
arch="x64"
;;
@ -520,7 +517,7 @@ fromFile() {
local add=""
[[ "$arch" != "x64" ]] && add="$arch"
case "$file" in
case "${file// /_}" in
"win7"* | "win_7"* | *"windows7"* | *"windows_7"* )
id="win7${arch}"
;;

View File

@ -620,11 +620,10 @@ getMG() {
}
local list=""
list=$(echo "$body" | xmllint --html --nonet --xpath "//a[contains(text(), '.iso')]" - 2>/dev/null)
list=$(echo "$body" | grep -Eo "(http|https)://[a-zA-Z0-9./?=_%:-]*" | grep -i '\.iso$')
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
@ -635,21 +634,6 @@ getMG() {
return 1
fi
local domain="buzzheavier.com"
if [[ "$result" = *"$domain"* ]]; then
result=$(curl --silent --max-time 30 --request GET --user-agent "$user_agent" --referer "$result" --head --proto =https --tlsv1.2 --http1.1 -- "$result/download") || {
handle_curl_error "$?" "$domain"
return $?
}
result=$(echo "$result" | grep -i -m 1 "hx-redirect:")
if [ -z "$result" ]; then
error "Failed to extract redirect location! Please report this at $SUPPORT/issues."
return 1
fi
result="https://${domain}${result:13}"
fi
MG_URL="$result"
return 0
}