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

Update define.sh

Browse source
This commit is contained in:
Kroese 2025-04-09 07:48:45 +02:00 • committed by GitHub
parent 995d5eaec1
commit 19609d1a25
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/define.sh
View file

@ -1215,7 +1215,7 @@ addFolder() {
cp -Lr "$folder/." "$dest" || return 1 cp -Lr "$folder/." "$dest" || return 1
local file local file
file=$(find "$dest" -maxdepth 1 -type f -iname install.bat | head -n 1) file=$(find "$dest" -maxdepth 1 -type f -iname install.bat -print -quit)
[ -f "$file" ] && unix2dos -q "$file" [ -f "$file" ] && unix2dos -q "$file"
return 0 return 0
@ -1310,7 +1310,7 @@ prepareInstall() {
fi fi
local pid file setup local pid file setup
setup=$(find "$target" -maxdepth 1 -type f -iname setupp.ini | head -n 1) setup=$(find "$target" -maxdepth 1 -type f -iname setupp.ini -print -quit)
if [ -n "$setup" ]; then if [ -n "$setup" ]; then
@ -1606,20 +1606,20 @@ detectLegacy() {
local dir="$1" local dir="$1"
local find find2 local find find2
find=$(find "$dir" -maxdepth 1 -type d -iname win95 | head -n 1) find=$(find "$dir" -maxdepth 1 -type d -iname win95 -print -quit)
[ -n "$find" ] && DETECTED="win95" && return 0 [ -n "$find" ] && DETECTED="win95" && return 0
find=$(find "$dir" -maxdepth 1 -type d -iname win98 | head -n 1) find=$(find "$dir" -maxdepth 1 -type d -iname win98 -print -quit)
[ -n "$find" ] && DETECTED="win98" && return 0 [ -n "$find" ] && DETECTED="win98" && return 0
find=$(find "$dir" -maxdepth 1 -type d -iname win9x | head -n 1) find=$(find "$dir" -maxdepth 1 -type d -iname win9x -print -quit)
[ -n "$find" ] && DETECTED="win9x" && return 0 [ -n "$find" ] && DETECTED="win9x" && return 0
find=$(find "$dir" -maxdepth 1 -type f -iname cdrom_nt.5 | head -n 1) find=$(find "$dir" -maxdepth 1 -type f -iname cdrom_nt.5 -print -quit)
[ -n "$find" ] && DETECTED="win2k" && return 0 [ -n "$find" ] && DETECTED="win2k" && return 0
find=$(find "$dir" -maxdepth 1 -type d -iname win51 | head -n 1) find=$(find "$dir" -maxdepth 1 -type d -iname win51 -print -quit)
find2=$(find "$dir" -maxdepth 1 -type f -iname setupxp.htm | head -n 1) find2=$(find "$dir" -maxdepth 1 -type f -iname setupxp.htm -print -quit)
if [ -n "$find" ] || [ -n "$find2" ] || [ -f "$dir/WIN51AP" ] || [ -f "$dir/WIN51IC" ]; then if [ -n "$find" ] || [ -n "$find2" ] || [ -f "$dir/WIN51AP" ] || [ -f "$dir/WIN51IC" ]; then
[ -d "$dir/AMD64" ] && DETECTED="winxpx64" && return 0 [ -d "$dir/AMD64" ] && DETECTED="winxpx64" && return 0