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

Update install.sh

Browse source
This commit is contained in:
Kroese 2024-04-30 16:06:24 +02:00 • committed by GitHub
parent f84f5e63cd
commit 215eec7d1e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/install.sh
View file

@ -529,6 +529,7 @@ extractImage() {
detectImage() { detectImage() {
XML="" XML=""
local dsc
local dir="$1" local dir="$1"
if [ -n "$CUSTOM" ]; then if [ -n "$CUSTOM" ]; then
@ -548,7 +549,6 @@ detectImage() {
if [[ "${DETECTED,,}" != "winxp"* ]]; then if [[ "${DETECTED,,}" != "winxp"* ]]; then
local dsc
dsc=$(printVersion "$DETECTED" "$DETECTED") dsc=$(printVersion "$DETECTED" "$DETECTED")
warn "got $dsc, but no matching file called $DETECTED.xml exists, $FB." warn "got $dsc, but no matching file called $DETECTED.xml exists, $FB."
@ -561,8 +561,14 @@ detectImage() {
if [[ "${PLATFORM,,}" == "x64" ]]; then if [[ "${PLATFORM,,}" == "x64" ]]; then
if [ -f "$dir/WIN51" ] || [ -f "$dir/SETUPXP.HTM" ]; then if [ -f "$dir/WIN51" ] || [ -f "$dir/SETUPXP.HTM" ]; then
if [ -d "$dir/AMD64" ]; then
DETECTED="winxpx64"
else
DETECTED="winxpx86" DETECTED="winxpx86"
info "Detected: Windows XP" && return 0 fi
dsc=$(printVersion "$DETECTED" "$DETECTED")
info "Detected: $dsc"
return 0
fi fi
fi fi