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

feat: Dynamic architecture

Browse source
This commit is contained in:
Kroese 2024-04-24 14:45:56 +02:00 • committed by GitHub
parent 3162025b7c
commit 39456f48c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/install.sh
View file

@ -102,6 +102,7 @@ if [ -z "$CUSTOM" ] && [[ "${VERSION,,}" != "http"* ]]; then
fi fi
ESD_URL="" ESD_URL=""
ARCH="x64"
MACHINE="q35" MACHINE="q35"
TMP="$STORAGE/tmp" TMP="$STORAGE/tmp"
DIR="$TMP/unpack" DIR="$TMP/unpack"
@ -380,14 +381,13 @@ getESD() {
local dir="$1" local dir="$1"
local file="$2" local file="$2"
local architecture="x64"
local winCatalog size local winCatalog size
case "${VERSION,,}" in case "${VERSION,,}" in
win11x64) "win11${ARCH,,}")
winCatalog="https://go.microsoft.com/fwlink?linkid=2156292" winCatalog="https://go.microsoft.com/fwlink?linkid=2156292"
;; ;;
win10x64) "win10${ARCH,,}")
winCatalog="https://go.microsoft.com/fwlink/?LinkId=841361" winCatalog="https://go.microsoft.com/fwlink/?LinkId=841361"
;; ;;
*) *)
@ -421,7 +421,7 @@ getESD() {
local esdLang="en-us" local esdLang="en-us"
local editionName="Professional" local editionName="Professional"
local edQuery='//File[Architecture="'${architecture}'"][Edition="'${editionName}'"]' local edQuery='//File[Architecture="'${ARCH}'"][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
@ -588,10 +588,10 @@ extractESD() {
local edition imageIndex imageEdition local edition imageIndex imageEdition
case "${VERSION,,}" in case "${VERSION,,}" in
win11x64) "win11${ARCH,,}")
edition="11 pro" edition="11 pro"
;; ;;
win10x64) "win10${ARCH,,}")
edition="10 pro" edition="10 pro"
;; ;;
*) *)