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

Update install.sh

Browse source
This commit is contained in:
Kroese 2024-05-26 20:33:49 +02:00 • committed by GitHub
parent 37aa068186
commit 40d15c8b56
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/install.sh
View file

@ -495,8 +495,7 @@ detectLegacy() {
if [ -n "$find" ] || [ -n "$find2" ]; then if [ -n "$find" ] || [ -n "$find2" ]; then
[ -d "$dir/AMD64" ] && DETECTED="winxpx64" || DETECTED="winxpx86" [ -d "$dir/AMD64" ] && DETECTED="winxpx64" || DETECTED="winxpx86"
desc=$(printEdition "$DETECTED" "Windows XP") desc=$(printEdition "$DETECTED" "Windows XP")
info "Detected: $desc" info "Detected: $desc" && return 0
return 0
fi fi
find=$(find "$dir" -maxdepth 1 -type d -iname win95 | head -n 1) find=$(find "$dir" -maxdepth 1 -type d -iname win95 | head -n 1)
@ -504,8 +503,7 @@ detectLegacy() {
if [ -n "$find" ]; then if [ -n "$find" ]; then
DETECTED="win95" DETECTED="win95"
desc=$(printEdition "$DETECTED" "Windows 95") desc=$(printEdition "$DETECTED" "Windows 95")
info "Detected: $desc" info "Detected: $desc" && return 0
return 0
fi fi
find=$(find "$dir" -maxdepth 1 -type d -iname win98 | head -n 1) find=$(find "$dir" -maxdepth 1 -type d -iname win98 | head -n 1)
@ -513,9 +511,17 @@ detectLegacy() {
if [ -n "$find" ]; then if [ -n "$find" ]; then
DETECTED="win98" DETECTED="win98"
desc=$(printEdition "$DETECTED" "Windows 98") desc=$(printEdition "$DETECTED" "Windows 98")
info "Detected: $desc" info "Detected: $desc" && return 0
return 0
fi fi
find=$(find "$dir" -maxdepth 1 -type d -iname win9x | head -n 1)
if [ -n "$find" ]; then
DETECTED="win9x"
desc=$(printEdition "$DETECTED" "Windows ME")
info "Detected: $desc" && return 0
fi
return 1 return 1
} }