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

Update install.sh

Browse source
This commit is contained in:
Kroese 2024-05-26 22:35:13 +02:00 • committed by GitHub
parent 01f970855a
commit 895141cd93
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/install.sh
View file

@ -546,6 +546,19 @@ detectLegacy() {
return 1 return 1
} }
skipVersion() {
local version="$1"
case "${version,,}" in
"win2k"* | "winxp"* | "win9"* )
return 0
;;
esac
return 1
}
detectImage() { detectImage() {
local dir="$1" local dir="$1"
@ -560,11 +573,7 @@ detectImage() {
if [ -n "$DETECTED" ]; then if [ -n "$DETECTED" ]; then
case "${DETECTED,,}" in skipVersion "${DETECTED,,}" && return 0
"win2k"* | "winxp"* | "win9"* )
return 0
;;
esac
if ! setXML "" && [[ "$MANUAL" != [Yy1]* ]]; then if ! setXML "" && [[ "$MANUAL" != [Yy1]* ]]; then
MANUAL="Y" MANUAL="Y"
@ -640,37 +649,32 @@ prepareImage() {
case "${DETECTED,,}" in case "${DETECTED,,}" in
"win9"* | "win2k"* ) "win9"* | "win2k"* )
MACHINE="pc-i440fx-2.4" MACHINE="pc-i440fx-2.4" ;;
;;
"winxp"* | "winvistax86"* | "win7x86"* ) "winxp"* | "winvistax86"* | "win7x86"* )
MACHINE="pc-q35-2.10" MACHINE="pc-q35-2.10" ;;
;; esac
case "${DETECTED,,}" in
"win9"* | "winxp"* | "win2k"* )
HV="N"
BOOT_MODE="windows_legacy" ;;
"winvista"* | "win7"* | "win2008"* )
BOOT_MODE="windows_legacy" ;;
esac esac
case "${DETECTED,,}" in case "${DETECTED,,}" in
"winxp"* ) "winxp"* )
HV="N" DISK_TYPE="blk"
DISK_TYPE="ide"
BOOT_MODE="windows_legacy"
prepareXP "$iso" "$dir" && return 0 prepareXP "$iso" "$dir" && return 0
error "Failed to prepare Windows XP ISO!" && return 1 error "Failed to prepare Windows XP ISO!" && return 1 ;;
;;
"win9"* ) "win9"* )
HV="N"
DISK_TYPE="auto" DISK_TYPE="auto"
BOOT_MODE="windows_legacy"
prepare9x "$iso" "$dir" && return 0 prepare9x "$iso" "$dir" && return 0
error "Failed to prepare Windows 9x ISO!" && return 1 error "Failed to prepare Windows 9x ISO!" && return 1 ;;
;;
"win2k"* ) "win2k"* )
HV="N"
DISK_TYPE="auto" DISK_TYPE="auto"
BOOT_MODE="windows_legacy"
prepare2k "$iso" "$dir" && return 0 prepare2k "$iso" "$dir" && return 0
error "Failed to prepare Windows 2000 ISO!" && return 1 error "Failed to prepare Windows 2000 ISO!" && return 1 ;;
;;
"winvista"* | "win7"* | "win2008"* )
BOOT_MODE="windows_legacy" ;;
esac esac
if [[ "${BOOT_MODE,,}" != "windows_legacy" ]]; then if [[ "${BOOT_MODE,,}" != "windows_legacy" ]]; then
@ -863,11 +867,7 @@ updateImage() {
local dat="${file//.xml/.dat}" local dat="${file//.xml/.dat}"
local desc path src wim xml index result local desc path src wim xml index result
case "${DETECTED,,}" in skipVersion "${DETECTED,,}" && return 0
"win2k"* | "winxp"* | "win9"* )
return 0
;;
esac
if [ ! -s "$asset" ] || [ ! -f "$asset" ]; then if [ ! -s "$asset" ] || [ ! -f "$asset" ]; then
asset="" asset=""