sebarocks/docker-windows
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2025-10-28 11:45:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Platform

Browse source
This commit is contained in:
Kroese 2024-04-24 18:32:43 +02:00 • committed by GitHub
parent 5e80a14e15
commit 26ec1de22b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/install.sh
View file

@ -104,8 +104,8 @@ if [ -z "$CUSTOM" ] && [[ "${VERSION,,}" != "http"* ]]; then
fi fi
ESD_URL="" ESD_URL=""
ARCHI="x64"
MACHINE="q35" MACHINE="q35"
PLATFORM="x64"
TMP="$STORAGE/tmp" TMP="$STORAGE/tmp"
DIR="$TMP/unpack" DIR="$TMP/unpack"
FB="falling back to manual installation!" FB="falling back to manual installation!"
@ -390,10 +390,10 @@ getESD() {
local winCatalog size local winCatalog size
case "${VERSION,,}" in case "${VERSION,,}" in
"win11${ARCHI,,}") "win11${PLATFORM,,}")
winCatalog="https://go.microsoft.com/fwlink?linkid=2156292" winCatalog="https://go.microsoft.com/fwlink?linkid=2156292"
;; ;;
"win10${ARCHI,,}") "win10${PLATFORM,,}")
winCatalog="https://go.microsoft.com/fwlink/?LinkId=841361" winCatalog="https://go.microsoft.com/fwlink/?LinkId=841361"
;; ;;
*) *)
@ -427,7 +427,7 @@ getESD() {
local esdLang="en-us" local esdLang="en-us"
local editionName="Professional" local editionName="Professional"
local edQuery='//File[Architecture="'${ARCHI}'"][Edition="'${editionName}'"]' local edQuery='//File[Architecture="'${PLATFORM}'"][Edition="'${editionName}'"]'
echo -e '<Catalog>' > "${dir}/products_filter.xml" echo -e '<Catalog>' > "${dir}/products_filter.xml"
xmllint --nonet --xpath "${edQuery}" "${dir}/products.xml" >> "${dir}/products_filter.xml" 2>/dev/null xmllint --nonet --xpath "${edQuery}" "${dir}/products.xml" >> "${dir}/products_filter.xml" 2>/dev/null
@ -537,11 +537,11 @@ downloadImage() {
if [[ "$EXTERNAL" != [Yy1]* ]]; then if [[ "$EXTERNAL" != [Yy1]* ]]; then
case "${VERSION,,}" in case "${VERSION,,}" in
"win11${ARCHI,,}") "win11${PLATFORM,,}")
url="https://dl.bobpony.com/windows/11/en-us_windows_11_23h2_${ARCHI,,}.iso" url="https://dl.bobpony.com/windows/11/en-us_windows_11_23h2_${PLATFORM,,}.iso"
;; ;;
"win10${ARCHI,,}") "win10${PLATFORM,,}")
url="https://dl.bobpony.com/windows/10/en-us_windows_10_22h2_${ARCHI,,}.iso" url="https://dl.bobpony.com/windows/10/en-us_windows_10_22h2_${PLATFORM,,}.iso"
;; ;;
*) *)
(( rc != 99 )) && error "Failed to download $url , reason: $rc" (( rc != 99 )) && error "Failed to download $url , reason: $rc"
@ -638,10 +638,10 @@ extractESD() {
local edition imageIndex imageEdition local edition imageIndex imageEdition
case "${VERSION,,}" in case "${VERSION,,}" in
"win11${ARCHI,,}") "win11${PLATFORM,,}")
edition="11 pro" edition="11 pro"
;; ;;
"win10${ARCHI,,}") "win10${PLATFORM,,}")
edition="10 pro" edition="10 pro"
;; ;;
*) *)