Zengtudor/windows_in_docker
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2025-04-05 08:22:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update install.sh

Browse Source
This commit is contained in:
Kroese 2025-04-03 00:15:53 +02:00 committed by GitHub
parent 50d97d7adb
commit afeb645bd5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/install.sh
View File

@ -18,14 +18,15 @@ skipInstall() {
previous=$(<"$previous") previous=$(<"$previous")
previous="${previous//[![:print:]]/}" previous="${previous//[![:print:]]/}"
if [ -n "$previous" ]; then if [ -n "$previous" ]; then
previous="$STORAGE/$previous" if [[ "${STORAGE,,}/${previous,,}" != "${iso,,}" ]]; then
if [[ "${previous,,}" != "${iso,,}" ]]; then
if [ -f "$boot" ] && hasDisk; then if [ -f "$boot" ] && hasDisk; then
info "Detected that the version was changed, but ignoring this because Windows is already installed." if [[ "$previous" != "windows."* ]]; then
info "Please start with an empty /storage folder, if you want to install a different version of Windows." info "Detected that the version was changed, but ignoring this because Windows is already installed."
info "Please start with an empty /storage folder, if you want to install a different version of Windows."
fi
return 0 return 0
fi fi
[ -f "$previous" ] && rm -f "$previous" rm -f "$STORAGE/$previous"
return 1 return 1
fi fi
fi fi
@ -203,7 +204,6 @@ detectCustom() {
local dir file base local dir file base
local fname="custom.iso" local fname="custom.iso"
local boot="$STORAGE/windows.boot" local boot="$STORAGE/windows.boot"
local previous="$STORAGE/windows.base"
CUSTOM="" CUSTOM=""
@ -211,15 +211,9 @@ detectCustom() {
[ ! -d "$dir" ] && dir=$(find "$STORAGE" -maxdepth 1 -type d -iname "$fname" | head -n 1) [ ! -d "$dir" ] && dir=$(find "$STORAGE" -maxdepth 1 -type d -iname "$fname" | head -n 1)
if [ -d "$dir" ]; then if [ -d "$dir" ]; then
if ! hasDisk || [ ! -f "$boot" ] || [ ! -f "$previous" ]; then if ! hasDisk || [ ! -f "$boot" ]; then
error "The bind $dir maps to a file that does not exist!" && return 1 error "The bind $dir maps to a file that does not exist!" && return 1
fi fi
previous=$(<"$previous")
previous="${previous//[![:print:]]/}"
ISO="$dir"
CUSTOM="$ISO"
BOOT="$STORAGE/$previous"
return 0
fi fi
file=$(find / -maxdepth 1 -type f -iname "$fname" | head -n 1) file=$(find / -maxdepth 1 -type f -iname "$fname" | head -n 1)