Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update download links #980

Merged
merged 5 commits into from
Dec 20, 2024
Merged

fix: Update download links #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07e943e
feat: Improve ISO detection
kroese Dec 14, 2024
d2f304e
build: Update VirtIO drivers to v1.9.44
kroese Dec 18, 2024
bf93dd0
Update define.sh
kroese Dec 20, 2024
e457b9f
fix: Update download links
kroese Dec 20, 2024
dbc746b
build: Update qemu-docker to v6.12
kroese Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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}
Expand Down
7 changes: 5 additions & 2 deletions src/define.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
Expand All @@ -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}"
;;
Expand Down
3 changes: 2 additions & 1 deletion src/mido.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading