extern/windows-docker
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2024-11-24 17:24:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: Disabled sleep mode and improved download (#413)

Browse Source
This commit is contained in:
Kroese 2024-04-24 20:16:43 +02:00 committed by GitHub
parent a6a65a67d1
commit adece2e559
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 283 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
assets/win10x64-enterprise-eval.xml
View File

@ -390,7 +390,12 @@
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>12</Order> <Order>12</Order>
<CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine>
<Description>Disable Hibernation Mode</Description> <Description>Disable Hibernation</Description>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<Order>13</Order>
<CommandLine>cmd /C POWERCFG -X -standby-timeout-ac 0</CommandLine>
<Description>Disable Sleep</Description>
</SynchronousCommand> </SynchronousCommand>
</FirstLogonCommands> </FirstLogonCommands>
</component> </component>

7
assets/win10x64-iot.xml
View File

@ -398,7 +398,12 @@
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>12</Order> <Order>12</Order>
<CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine>
<Description>Disable Hibernation Mode</Description> <Description>Disable Hibernation</Description>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<Order>13</Order>
<CommandLine>cmd /C POWERCFG -X -standby-timeout-ac 0</CommandLine>
<Description>Disable Sleep</Description>
</SynchronousCommand> </SynchronousCommand>
</FirstLogonCommands> </FirstLogonCommands>
</component> </component>

7
assets/win10x64-ltsc.xml
View File

@ -396,7 +396,12 @@
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>12</Order> <Order>12</Order>
<CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine>
<Description>Disable Hibernation Mode</Description> <Description>Disable Hibernation</Description>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<Order>13</Order>
<CommandLine>cmd /C POWERCFG -X -standby-timeout-ac 0</CommandLine>
<Description>Disable Sleep</Description>
</SynchronousCommand> </SynchronousCommand>
</FirstLogonCommands> </FirstLogonCommands>
</component> </component>

7
assets/win10x64.xml
View File

@ -392,7 +392,12 @@
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>12</Order> <Order>12</Order>
<CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine>
<Description>Disable Hibernation Mode</Description> <Description>Disable Hibernation</Description>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<Order>13</Order>
<CommandLine>cmd /C POWERCFG -X -standby-timeout-ac 0</CommandLine>
<Description>Disable Sleep</Description>
</SynchronousCommand> </SynchronousCommand>
</FirstLogonCommands> </FirstLogonCommands>
</component> </component>

9
assets/win11x64-enterprise-eval.xml
View File

@ -408,15 +408,20 @@
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>12</Order> <Order>12</Order>
<CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine>
<Description>Disable Hibernation Mode</Description> <Description>Disable Hibernation</Description>
</SynchronousCommand> </SynchronousCommand>
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>13</Order> <Order>13</Order>
<CommandLine>cmd /C POWERCFG -X -standby-timeout-ac 0</CommandLine>
<Description>Disable Sleep</Description>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<Order>14</Order>
<CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV1 /d 0 /t REG_DWORD /f</CommandLine> <CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV1 /d 0 /t REG_DWORD /f</CommandLine>
<Description>Disable unsupported hardware notifications</Description> <Description>Disable unsupported hardware notifications</Description>
</SynchronousCommand> </SynchronousCommand>
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>14</Order> <Order>15</Order>
<CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV2 /d 0 /t REG_DWORD /f</CommandLine> <CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV2 /d 0 /t REG_DWORD /f</CommandLine>
<Description>Disable unsupported hardware notifications</Description> <Description>Disable unsupported hardware notifications</Description>
</SynchronousCommand> </SynchronousCommand>

9
assets/win11x64.xml
View File

@ -410,15 +410,20 @@
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>12</Order> <Order>12</Order>
<CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine>
<Description>Disable Hibernation Mode</Description> <Description>Disable Hibernation</Description>
</SynchronousCommand> </SynchronousCommand>
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>13</Order> <Order>13</Order>
<CommandLine>cmd /C POWERCFG -X -standby-timeout-ac 0</CommandLine>
<Description>Disable Sleep</Description>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<Order>14</Order>
<CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV1 /d 0 /t REG_DWORD /f</CommandLine> <CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV1 /d 0 /t REG_DWORD /f</CommandLine>
<Description>Disable unsupported hardware notifications</Description> <Description>Disable unsupported hardware notifications</Description>
</SynchronousCommand> </SynchronousCommand>
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>14</Order> <Order>15</Order>
<CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV2 /d 0 /t REG_DWORD /f</CommandLine> <CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV2 /d 0 /t REG_DWORD /f</CommandLine>
<Description>Disable unsupported hardware notifications</Description> <Description>Disable unsupported hardware notifications</Description>
</SynchronousCommand> </SynchronousCommand>

7
assets/win2008r2.xml
View File

@ -280,7 +280,12 @@
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>12</Order> <Order>12</Order>
<CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine>
<Description>Disable Hibernation Mode</Description> <Description>Disable Hibernation</Description>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<Order>13</Order>
<CommandLine>cmd /C POWERCFG -X -standby-timeout-ac 0</CommandLine>
<Description>Disable Sleep</Description>
</SynchronousCommand> </SynchronousCommand>
</FirstLogonCommands> </FirstLogonCommands>
</component> </component>

7
assets/win2012r2-eval.xml
View File

@ -319,7 +319,12 @@
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>12</Order> <Order>12</Order>
<CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine>
<Description>Disable Hibernation Mode</Description> <Description>Disable Hibernation</Description>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<Order>13</Order>
<CommandLine>cmd /C POWERCFG -X -standby-timeout-ac 0</CommandLine>
<Description>Disable Sleep</Description>
</SynchronousCommand> </SynchronousCommand>
</FirstLogonCommands> </FirstLogonCommands>
</component> </component>

7
assets/win2016-eval.xml
View File

@ -319,7 +319,12 @@
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>12</Order> <Order>12</Order>
<CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine>
<Description>Disable Hibernation Mode</Description> <Description>Disable Hibernation</Description>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<Order>13</Order>
<CommandLine>cmd /C POWERCFG -X -standby-timeout-ac 0</CommandLine>
<Description>Disable Sleep</Description>
</SynchronousCommand> </SynchronousCommand>
</FirstLogonCommands> </FirstLogonCommands>
</component> </component>

7
assets/win2019-eval.xml
View File

@ -323,7 +323,12 @@
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>12</Order> <Order>12</Order>
<CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine>
<Description>Disable Hibernation Mode</Description> <Description>Disable Hibernation</Description>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<Order>13</Order>
<CommandLine>cmd /C POWERCFG -X -standby-timeout-ac 0</CommandLine>
<Description>Disable Sleep</Description>
</SynchronousCommand> </SynchronousCommand>
</FirstLogonCommands> </FirstLogonCommands>
</component> </component>

7
assets/win2022-eval.xml
View File

@ -323,7 +323,12 @@
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>12</Order> <Order>12</Order>
<CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine>
<Description>Disable Hibernation Mode</Description> <Description>Disable Hibernation</Description>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<Order>13</Order>
<CommandLine>cmd /C POWERCFG -X -standby-timeout-ac 0</CommandLine>
<Description>Disable Sleep</Description>
</SynchronousCommand> </SynchronousCommand>
</FirstLogonCommands> </FirstLogonCommands>
</component> </component>

7
assets/win7x64.xml
View File

@ -283,7 +283,12 @@
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>12</Order> <Order>12</Order>
<CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine>
<Description>Disable Hibernation Mode</Description> <Description>Disable Hibernation</Description>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<Order>13</Order>
<CommandLine>cmd /C POWERCFG -X -standby-timeout-ac 0</CommandLine>
<Description>Disable Sleep</Description>
</SynchronousCommand> </SynchronousCommand>
</FirstLogonCommands> </FirstLogonCommands>
</component> </component>

7
assets/win81x64-enterprise-eval.xml
View File

@ -304,7 +304,12 @@
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>12</Order> <Order>12</Order>
<CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine>
<Description>Disable Hibernation Mode</Description> <Description>Disable Hibernation</Description>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<Order>13</Order>
<CommandLine>cmd /C POWERCFG -X -standby-timeout-ac 0</CommandLine>
<Description>Disable Sleep</Description>
</SynchronousCommand> </SynchronousCommand>
</FirstLogonCommands> </FirstLogonCommands>
</component> </component>

7
assets/win81x64.xml
View File

@ -313,7 +313,12 @@
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>12</Order> <Order>12</Order>
<CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine>
<Description>Disable Hibernation Mode</Description> <Description>Disable Hibernation</Description>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<Order>13</Order>
<CommandLine>cmd /C POWERCFG -X -standby-timeout-ac 0</CommandLine>
<Description>Disable Sleep</Description>
</SynchronousCommand> </SynchronousCommand>
</FirstLogonCommands> </FirstLogonCommands>
</component> </component>

15
assets/winvistax64.xml
View File

@ -222,30 +222,35 @@
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>12</Order> <Order>12</Order>
<CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Power" /v "HibernateEnabled" /t REG_DWORD /d 0 /f</CommandLine>
<Description>Disable Hibernation Mode</Description> <Description>Disable Hibernation</Description>
</SynchronousCommand> </SynchronousCommand>
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>13</Order> <Order>13</Order>
<CommandLine>cmd /C POWERCFG -X -standby-timeout-ac 0</CommandLine>
<Description>Disable Sleep</Description>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<Order>14</Order>
<CommandLine>netsh.exe advfirewall firewall set rule group="Remote Desktop" new enable=Yes</CommandLine> <CommandLine>netsh.exe advfirewall firewall set rule group="Remote Desktop" new enable=Yes</CommandLine>
<Description>Add RDP in firewall</Description> <Description>Add RDP in firewall</Description>
</SynchronousCommand> </SynchronousCommand>
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>14</Order> <Order>15</Order>
<CommandLine>netsh.exe Advfirewall set allprofiles state off</CommandLine> <CommandLine>netsh.exe Advfirewall set allprofiles state off</CommandLine>
<Description>Disable firewall</Description> <Description>Disable firewall</Description>
</SynchronousCommand> </SynchronousCommand>
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>15</Order> <Order>16</Order>
<CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server" /v fDenyTSConnections /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server" /v fDenyTSConnections /t REG_DWORD /d 0 /f</CommandLine>
<Description>Enable RDP</Description> <Description>Enable RDP</Description>
</SynchronousCommand> </SynchronousCommand>
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>16</Order> <Order>17</Order>
<CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Windows\Sidebar" /v "TurnOffSidebar" /t REG_DWORD /d 1 /f</CommandLine> <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Windows\Sidebar" /v "TurnOffSidebar" /t REG_DWORD /d 1 /f</CommandLine>
<Description>Turn off sidebar</Description> <Description>Turn off sidebar</Description>
</SynchronousCommand> </SynchronousCommand>
<SynchronousCommand wcm:action="add"> <SynchronousCommand wcm:action="add">
<Order>17</Order> <Order>18</Order>
<CommandLine>reg.exe add "HKCU\Control Panel\Desktop" /v "ScreenSaveActive" /t REG_DWORD /d 0 /f</CommandLine> <CommandLine>reg.exe add "HKCU\Control Panel\Desktop" /v "ScreenSaveActive" /t REG_DWORD /d 0 /f</CommandLine>
<Description>Disable screensaver</Description> <Description>Disable screensaver</Description>
</SynchronousCommand> </SynchronousCommand>

2
src/entry.sh
View File

@ -29,7 +29,7 @@ info "Booting ${APP}${BOOT_DESC} on a ${CPU} using QEMU v${VERS} with kernel $(u
terminal terminal
tail -fn +0 "$QEMU_LOG" 2>/dev/null & tail -fn +0 "$QEMU_LOG" 2>/dev/null &
( sleep 6; [ ! -f "$QEMU_END" ] && info "Windows started succesfully, visit http://localhost:8006/ to view the screen..." ) & ( sleep 10; [ ! -f "$QEMU_END" ] && info "Windows started succesfully, visit http://localhost:8006/ to view the screen..." ) &
cat "$QEMU_TERM" 2> /dev/null | tee "$QEMU_PTY" & cat "$QEMU_TERM" 2> /dev/null | tee "$QEMU_PTY" &
wait $! || : wait $! || :

345
src/install.sh
View File

@ -2,8 +2,10 @@
set -Eeuo pipefail set -Eeuo pipefail
: "${MANUAL:=""}" : "${MANUAL:=""}"
: "${VERSION:=""}"
: "${DETECTED:=""}" : "${DETECTED:=""}"
: "${VERSION:="win11x64"}"
[ -z "$VERSION" ] && VERSION="win11x64"
if [[ "${VERSION}" == \"*\" || "${VERSION}" == \'*\' ]]; then if [[ "${VERSION}" == \"*\" || "${VERSION}" == \'*\' ]]; then
VERSION="${VERSION:1:-1}" VERSION="${VERSION:1:-1}"
@ -103,6 +105,7 @@ fi
ESD_URL="" ESD_URL=""
MACHINE="q35" MACHINE="q35"
PLATFORM="x64"
TMP="$STORAGE/tmp" TMP="$STORAGE/tmp"
DIR="$TMP/unpack" DIR="$TMP/unpack"
FB="falling back to manual installation!" FB="falling back to manual installation!"
@ -112,7 +115,7 @@ EFISYS="efi/microsoft/boot/efisys_noprompt.bin"
printVersion() { printVersion() {
local id="$1" local id="$1"
local desc="" local desc="$2"
[[ "$id" == "win7"* ]] && desc="Windows 7" [[ "$id" == "win7"* ]] && desc="Windows 7"
[[ "$id" == "win8"* ]] && desc="Windows 8" [[ "$id" == "win8"* ]] && desc="Windows 8"
@ -134,6 +137,8 @@ printVersion() {
[[ "$id" == "win10x64-enterprise-eval" ]] && desc="Windows 10 Enterprise" [[ "$id" == "win10x64-enterprise-eval" ]] && desc="Windows 10 Enterprise"
[[ "$id" == "win11x64-enterprise-eval" ]] && desc="Windows 11 Enterprise" [[ "$id" == "win11x64-enterprise-eval" ]] && desc="Windows 11 Enterprise"
[ -z "$desc" ] && desc="Windows"
echo "$desc" echo "$desc"
return 0 return 0
} }
@ -141,7 +146,7 @@ printVersion() {
getName() { getName() {
local file="$1" local file="$1"
local desc="" local desc="$2"
[[ "${file,,}" == "win11"* ]] && desc="Windows 11" [[ "${file,,}" == "win11"* ]] && desc="Windows 11"
[[ "${file,,}" == "win10"* ]] && desc="Windows 10" [[ "${file,,}" == "win10"* ]] && desc="Windows 10"
@ -177,6 +182,8 @@ getName() {
[[ "${file,,}" == *"server_2022"* ]] && desc="Windows Server 2022" [[ "${file,,}" == *"server_2022"* ]] && desc="Windows Server 2022"
[[ "${file,,}" == *"server_2025"* ]] && desc="Windows Server 2025" [[ "${file,,}" == *"server_2025"* ]] && desc="Windows Server 2025"
[ -z "$desc" ] && desc="Windows"
echo "$desc" echo "$desc"
return 0 return 0
} }
@ -258,15 +265,13 @@ finishInstall() {
local aborted="$2" local aborted="$2"
if [ ! -s "$iso" ] || [ ! -f "$iso" ]; then if [ ! -s "$iso" ] || [ ! -f "$iso" ]; then
error "Failed to find ISO: $iso" error "Failed to find ISO: $iso" && return 1
return 1
fi fi
if [ -w "$iso" ] && [[ "$aborted" != [Yy1]* ]]; then if [ -w "$iso" ] && [[ "$aborted" != [Yy1]* ]]; then
# Mark ISO as prepared via magic byte # Mark ISO as prepared via magic byte
if ! printf '\x16' | dd of="$iso" bs=1 seek=0 count=1 conv=notrunc status=none; then if ! printf '\x16' | dd of="$iso" bs=1 seek=0 count=1 conv=notrunc status=none; then
error "Failed to set magic byte!" error "Failed to set magic byte!" && return 1
return 1
fi fi
fi fi
@ -297,17 +302,13 @@ abortInstall() {
if [[ "$iso" != "$STORAGE/$BASE" ]]; then if [[ "$iso" != "$STORAGE/$BASE" ]]; then
if ! mv -f "$iso" "$STORAGE/$BASE"; then if ! mv -f "$iso" "$STORAGE/$BASE"; then
error "Failed to move ISO: $iso" error "Failed to move ISO: $iso" && return 1
exit 69
fi fi
fi fi
if ! finishInstall "$STORAGE/$BASE" "Y"; then finishInstall "$STORAGE/$BASE" "Y" && return 0
error "Failed to finish installation!"
exit 69
fi
return 0 return 1
} }
startInstall() { startInstall() {
@ -344,6 +345,11 @@ startInstall() {
fi fi
fi fi
if skipInstall; then
[ ! -f "$STORAGE/$BASE" ] && BASE=""
return 1
fi
if [ -f "$STORAGE/$BASE" ]; then if [ -f "$STORAGE/$BASE" ]; then
# Check if the ISO was already processed by our script # Check if the ISO was already processed by our script
@ -364,11 +370,6 @@ startInstall() {
fi fi
if skipInstall; then
[ ! -f "$STORAGE/$BASE" ] && BASE=""
return 1
fi
rm -rf "$TMP" rm -rf "$TMP"
mkdir -p "$TMP" mkdir -p "$TMP"
@ -385,20 +386,17 @@ startInstall() {
getESD() { getESD() {
local dir="$1" local dir="$1"
local file="$2"
local architecture="x64"
local winCatalog size local winCatalog size
case "${VERSION,,}" in case "${VERSION,,}" in
win11x64) "win11${PLATFORM,,}")
winCatalog="https://go.microsoft.com/fwlink?linkid=2156292" winCatalog="https://go.microsoft.com/fwlink?linkid=2156292"
;; ;;
win10x64) "win10${PLATFORM,,}")
winCatalog="https://go.microsoft.com/fwlink/?LinkId=841361" winCatalog="https://go.microsoft.com/fwlink/?LinkId=841361"
;; ;;
*) *)
error "Invalid ESD version specified: $VERSION" error "Invalid ESD version specified: $VERSION" && return 1
return 1
;; ;;
esac esac
@ -428,7 +426,7 @@ getESD() {
local esdLang="en-us" local esdLang="en-us"
local editionName="Professional" local editionName="Professional"
local edQuery='//File[Architecture="'${architecture}'"][Edition="'${editionName}'"]' local edQuery='//File[Architecture="'${PLATFORM}'"][Edition="'${editionName}'"]'
echo -e '<Catalog>' > "${dir}/products_filter.xml" echo -e '<Catalog>' > "${dir}/products_filter.xml"
xmllint --nonet --xpath "${edQuery}" "${dir}/products.xml" >> "${dir}/products_filter.xml" 2>/dev/null xmllint --nonet --xpath "${edQuery}" "${dir}/products.xml" >> "${dir}/products_filter.xml" 2>/dev/null
@ -443,56 +441,102 @@ getESD() {
ESD_URL=$(xmllint --nonet --xpath '//FilePath' "${dir}/esd_edition.xml" | sed -E -e 's/<[\/]?FilePath>//g') ESD_URL=$(xmllint --nonet --xpath '//FilePath' "${dir}/esd_edition.xml" | sed -E -e 's/<[\/]?FilePath>//g')
if [ -z "$ESD_URL" ]; then if [ -z "$ESD_URL" ]; then
error "Failed to find ESD url!" && return 1 error "Failed to find ESD URL!" && return 1
fi fi
rm -rf "$dir" rm -rf "$dir"
return 0 return 0
} }
downloadImage() { doMido() {
local iso="$1" local iso="$1"
local url="$2" local url="$2"
local file="$iso" local desc="$3"
local desc rc progress local rc
rm -f "$iso"
rm -f "$iso.PART"
local msg="Downloading $desc..."
info "$msg" && html "$msg"
/run/progress.sh "$iso.PART" "Downloading $desc ([P])..." &
cd "$TMP"
{ /run/mido.sh "$url"; rc=$?; } || :
cd /run
fKill "progress.sh"
if (( rc == 0 )) && [ -f "$iso" ]; then
if [ "$(stat -c%s "$iso")" -gt 100000000 ]; then
html "Download finished successfully..." && return 0
fi
fi
rm -f "$iso"
rm -f "$iso.PART"
return 1
}
downloadFile() {
local iso="$1"
local url="$2"
local desc="$3"
local rc progress
rm -f "$iso" rm -f "$iso"
if [[ "$EXTERNAL" != [Yy1]* ]]; then # Check if running with interactive TTY or redirected to docker log
if [ -t 1 ]; then
file="$iso.PART" progress="--progress=bar:noscroll"
desc=$(printVersion "$VERSION")
[ -z "$desc" ] && desc="Windows"
else else
progress="--progress=dot:giga"
desc=$(getName "$BASE")
[ -z "$desc" ] && desc="$BASE"
fi fi
local msg="Downloading $desc..." local msg="Downloading $desc..."
info "$msg" && html "$msg" info "$msg" && html "$msg"
/run/progress.sh "$file" "Downloading $desc ([P])..." & /run/progress.sh "$iso" "Downloading $desc ([P])..." &
{ wget "$url" -O "$iso" -q --no-check-certificate --show-progress "$progress"; rc=$?; } || :
fKill "progress.sh"
if (( rc == 0 )) && [ -f "$iso" ]; then
if [ "$(stat -c%s "$iso")" -gt 100000000 ]; then
html "Download finished successfully..." && return 0
fi
fi
rm -f "$iso"
error "Failed to download $url , reason: $rc"
return 1
}
downloadImage() {
local iso="$1"
local url="$2"
local rc desc
if [[ "$EXTERNAL" != [Yy1]* ]]; then if [[ "$EXTERNAL" != [Yy1]* ]]; then
cd "$TMP" desc=$(printVersion "$VERSION" "Windows")
{ /run/mido.sh "$url"; rc=$?; } || :
cd /run
fKill "progress.sh" else
if (( rc == 0 )); then desc=$(getName "$BASE" "$BASE")
[ ! -s "$iso" ] || [ ! -f "$iso" ] && return 1 fi
html "Download finished successfully..." if [[ "$EXTERNAL" != [Yy1]* ]]; then
return 0
fi
if [[ "$VERSION" != "win10x64"* ]] && [[ "$VERSION" != "win11x64" ]]; then doMido "$iso" "$url" "$desc" && return 0
if [[ "$VERSION" != "win10${PLATFORM,,}" ]] && [[ "$VERSION" != "win11${PLATFORM,,}" ]]; then
return 1 return 1
fi fi
@ -503,36 +547,44 @@ downloadImage() {
ISO="$TMP/$VERSION.esd" ISO="$TMP/$VERSION.esd"
iso="$ISO" iso="$ISO"
file="$ISO"
rm -f "$iso"
if ! getESD "$TMP/esd" "$iso"; then if ! getESD "$TMP/esd"; then
return 1 url=""
else
url="$ESD_URL"
fi fi
url="$ESD_URL"
msg="Downloading $desc..."
info "$msg" && html "$msg"
/run/progress.sh "$iso" "Downloading $desc ([P])..." &
fi fi
# Check if running with interactive TTY or redirected to docker log if [ -n "$url" ]; then
if [ -t 1 ]; then downloadFile "$iso" "$url" "$desc" && return 0
progress="--progress=bar:noscroll"
else
progress="--progress=dot:giga"
fi fi
{ wget "$url" -O "$iso" -q --no-check-certificate --show-progress "$progress"; rc=$?; } || : [[ "$EXTERNAL" == [Yy1]* ]] && return 1
fKill "progress.sh" case "${VERSION,,}" in
(( rc != 0 )) && error "Failed to download $url , reason: $rc" && exit 60 "win11${PLATFORM,,}")
url="https://dl.bobpony.com/windows/11/en-us_windows_11_23h2_${PLATFORM,,}.iso"
;;
"win10${PLATFORM,,}")
url="https://dl.bobpony.com/windows/10/en-us_windows_10_22h2_${PLATFORM,,}.iso"
;;
*)
return 1
;;
esac
[ ! -s "$iso" ] || [ ! -f "$iso" ] && return 1 info "Failed to download $desc from Microsoft, will try another mirror now..."
html "Download finished successfully..." rm -rf "$TMP"
return 0 mkdir -p "$TMP"
ISO="$TMP/$BASE"
iso="$ISO"
downloadFile "$iso" "$url" "$desc" && return 0
return 1
} }
extractESD() { extractESD() {
@ -541,26 +593,26 @@ extractESD() {
local dir="$2" local dir="$2"
local size size_gb space space_gb desc local size size_gb space space_gb desc
desc=$(printVersion "$VERSION") desc=$(printVersion "$VERSION" "Windows")
local msg="Extracting $desc bootdisk..." local msg="Extracting $desc bootdisk..."
info "$msg" && html "$msg" info "$msg" && html "$msg"
size=16106127360 if [ "$(stat -c%s "$iso")" -lt 100000000 ]; then
size_gb=$(( (size + 1073741823)/1073741824 )) error "Invalid ESD file: Size is smaller than 100 MB" && return 1
space=$(df --output=avail -B 1 "$TMP" | tail -n 1)
space_gb=$(( (space + 1073741823)/1073741824 ))
if ((size<10000000)); then
error "Invalid ESD file: Size is smaller than 10 MB" && exit 62
fi
if (( size > space )); then
error "Not enough free space in $STORAGE, have $space_gb GB available but need at least $size_gb GB." && exit 63
fi fi
rm -rf "$dir" rm -rf "$dir"
mkdir -p "$dir" mkdir -p "$dir"
size=16106127360
size_gb=$(( (size + 1073741823)/1073741824 ))
space=$(df --output=avail -B 1 "$dir" | tail -n 1)
space_gb=$(( (space + 1073741823)/1073741824 ))
if (( size > space )); then
error "Not enough free space in $STORAGE, have $space_gb GB available but need at least $size_gb GB." && return 1
fi
local esdImageCount local esdImageCount
esdImageCount=$(wimlib-imagex info "${iso}" | awk '/Image Count:/ {print $3}') esdImageCount=$(wimlib-imagex info "${iso}" | awk '/Image Count:/ {print $3}')
@ -594,15 +646,14 @@ extractESD() {
local edition imageIndex imageEdition local edition imageIndex imageEdition
case "${VERSION,,}" in case "${VERSION,,}" in
win11x64) "win11${PLATFORM,,}")
edition="11 pro" edition="11 pro"
;; ;;
win10x64) "win10${PLATFORM,,}")
edition="10 pro" edition="10 pro"
;; ;;
*) *)
error "Invalid version specified: $VERSION" error "Invalid version specified: $VERSION" && return 1
return 1
;; ;;
esac esac
@ -616,8 +667,7 @@ extractESD() {
return 0 return 0
done done
error "Failed to find product in install.wim!" error "Failed to find product in install.wim!" && return 1
return 1
} }
extractImage() { extractImage() {
@ -628,42 +678,38 @@ extractImage() {
local size size_gb space space_gb local size size_gb space space_gb
if [[ "${iso,,}" == *".esd" ]]; then if [[ "${iso,,}" == *".esd" ]]; then
if ! extractESD "$iso" "$dir"; then extractESD "$iso" "$dir" && return 0
rm -f "$iso" return 1
error "Failed to extract ESD file!"
exit 67
fi
return 0
fi fi
if [[ "$EXTERNAL" != [Yy1]* ]] && [ -z "$CUSTOM" ]; then if [[ "$EXTERNAL" != [Yy1]* ]] && [ -z "$CUSTOM" ]; then
desc=$(printVersion "$VERSION") desc=$(printVersion "$VERSION" "downloaded ISO")
[ -z "$desc" ] && desc="downloaded ISO"
fi fi
local msg="Extracting $desc image..." local msg="Extracting $desc image..."
[ -n "$CUSTOM" ] && msg="Extracting local ISO image..." [ -n "$CUSTOM" ] && msg="Extracting local ISO image..."
info "$msg" && html "$msg" info "$msg" && html "$msg"
rm -rf "$dir"
mkdir -p "$dir"
size=$(stat -c%s "$iso") size=$(stat -c%s "$iso")
size_gb=$(( (size + 1073741823)/1073741824 )) size_gb=$(( (size + 1073741823)/1073741824 ))
space=$(df --output=avail -B 1 "$TMP" | tail -n 1) space=$(df --output=avail -B 1 "$dir" | tail -n 1)
space_gb=$(( (space + 1073741823)/1073741824 )) space_gb=$(( (space + 1073741823)/1073741824 ))
if ((size<10000000)); then if ((size<100000000)); then
error "Invalid ISO file: Size is smaller than 10 MB" && exit 62 error "Invalid ISO file: Size is smaller than 100 MB" && return 1
fi fi
if (( size > space )); then if (( size > space )); then
error "Not enough free space in $STORAGE, have $space_gb GB available but need at least $size_gb GB." && exit 63 error "Not enough free space in $STORAGE, have $space_gb GB available but need at least $size_gb GB." && return 1
fi fi
rm -rf "$dir" rm -rf "$dir"
if ! 7z x "$iso" -o"$dir" > /dev/null; then if ! 7z x "$iso" -o"$dir" > /dev/null; then
rm -f "$iso" error "Failed to extract ISO file: $iso" && return 1
error "Failed to extract ISO file!"
exit 66
fi fi
return 0 return 0
@ -692,8 +738,7 @@ detectImage() {
if [[ "${DETECTED,,}" != "winxp"* ]]; then if [[ "${DETECTED,,}" != "winxp"* ]]; then
local dsc local dsc
dsc=$(printVersion "$DETECTED") dsc=$(printVersion "$DETECTED" "$DETECTED")
[ -z "$dsc" ] && dsc="$DETECTED"
warn "got $dsc, but no matching XML file exists, $FB." warn "got $dsc, but no matching XML file exists, $FB."
fi fi
@ -705,26 +750,23 @@ detectImage() {
if [ -f "$dir/WIN51" ] || [ -f "$dir/SETUPXP.HTM" ]; then if [ -f "$dir/WIN51" ] || [ -f "$dir/SETUPXP.HTM" ]; then
DETECTED="winxpx86" DETECTED="winxpx86"
info "Detected: Windows XP" info "Detected: Windows XP" && return 0
return 0
fi fi
local src loc tag result name name2 desc local src loc tag result name name2 desc
src=$(find "$dir" -maxdepth 1 -type d -iname sources | head -n 1) src=$(find "$dir" -maxdepth 1 -type d -iname sources | head -n 1)
if [ ! -d "$src" ]; then if [ ! -d "$src" ]; then
warn "failed to locate 'sources' folder in ISO image, $FB"
BOOT_MODE="windows_legacy" BOOT_MODE="windows_legacy"
return 1 warn "failed to locate 'sources' folder in ISO image, $FB" && return 1
fi fi
loc=$(find "$src" -maxdepth 1 -type f -iname install.wim | head -n 1) loc=$(find "$src" -maxdepth 1 -type f -iname install.wim | head -n 1)
[ ! -f "$loc" ] && loc=$(find "$src" -maxdepth 1 -type f -iname install.esd | head -n 1) [ ! -f "$loc" ] && loc=$(find "$src" -maxdepth 1 -type f -iname install.esd | head -n 1)
if [ ! -f "$loc" ]; then if [ ! -f "$loc" ]; then
warn "failed to locate 'install.wim' or 'install.esd' in ISO image, $FB"
BOOT_MODE="windows_legacy" BOOT_MODE="windows_legacy"
return 1 warn "failed to locate 'install.wim' or 'install.esd' in ISO image, $FB" && return 1
fi fi
tag="DISPLAYNAME" tag="DISPLAYNAME"
@ -742,12 +784,10 @@ detectImage() {
fi fi
if [ -z "$DETECTED" ]; then if [ -z "$DETECTED" ]; then
warn "failed to determine Windows version from string '$name', $FB" warn "failed to determine Windows version from string '$name', $FB" && return 0
return 0
fi fi
desc=$(printVersion "$DETECTED") desc=$(printVersion "$DETECTED" "$DETECTED")
[ -z "$desc" ] && desc="$DETECTED"
if [ -f "/run/assets/$DETECTED.xml" ]; then if [ -f "/run/assets/$DETECTED.xml" ]; then
[[ "$MANUAL" != [Yy1]* ]] && XML="$DETECTED.xml" [[ "$MANUAL" != [Yy1]* ]] && XML="$DETECTED.xml"
@ -781,8 +821,7 @@ prepareXP() {
rm -rf "$drivers" rm -rf "$drivers"
if ! 7z x /run/drivers.iso -o"$drivers" > /dev/null; then if ! 7z x /run/drivers.iso -o"$drivers" > /dev/null; then
error "Failed to extract driver ISO file!" error "Failed to extract driver ISO file!" && exit 66
exit 66
fi fi
cp "$drivers/viostor/xp/$arch/viostor.sys" "$target" cp "$drivers/viostor/xp/$arch/viostor.sys" "$target"
@ -953,8 +992,7 @@ prepareLegacy() {
offset=$(isoinfo -d -i "$iso" | grep "Bootoff " | grep -o "[^ ]*$") offset=$(isoinfo -d -i "$iso" | grep "Bootoff " | grep -o "[^ ]*$")
if ! dd "if=$iso" "of=$dir/$ETFS" bs=2048 "count=$len" "skip=$offset" status=none; then if ! dd "if=$iso" "of=$dir/$ETFS" bs=2048 "count=$len" "skip=$offset" status=none; then
error "Failed to extract boot image from ISO!" error "Failed to extract boot image from ISO!" && exit 67
exit 67
fi fi
return 0 return 0
@ -985,13 +1023,11 @@ prepareImage() {
if [[ "${DETECTED,,}" == "winxp"* ]]; then if [[ "${DETECTED,,}" == "winxp"* ]]; then
if ! prepareXP "$iso" "$dir"; then if ! prepareXP "$iso" "$dir"; then
error "Failed to prepare Windows XP ISO!" error "Failed to prepare Windows XP ISO!" && return 1
return 1
fi fi
else else
if ! prepareLegacy "$iso" "$dir"; then if ! prepareLegacy "$iso" "$dir"; then
error "Failed to prepare Windows ISO!" error "Failed to prepare Windows ISO!" && return 1
return 1
fi fi
fi fi
@ -1013,18 +1049,16 @@ updateImage() {
src=$(find "$dir" -maxdepth 1 -type d -iname sources | head -n 1) src=$(find "$dir" -maxdepth 1 -type d -iname sources | head -n 1)
if [ ! -d "$src" ]; then if [ ! -d "$src" ]; then
warn "failed to locate 'sources' folder in ISO image, $FB"
BOOT_MODE="windows_legacy" BOOT_MODE="windows_legacy"
return 1 warn "failed to locate 'sources' folder in ISO image, $FB" && return 1
fi fi
loc=$(find "$src" -maxdepth 1 -type f -iname boot.wim | head -n 1) loc=$(find "$src" -maxdepth 1 -type f -iname boot.wim | head -n 1)
[ ! -f "$loc" ] && loc=$(find "$src" -maxdepth 1 -type f -iname boot.esd | head -n 1) [ ! -f "$loc" ] && loc=$(find "$src" -maxdepth 1 -type f -iname boot.esd | head -n 1)
if [ ! -f "$loc" ]; then if [ ! -f "$loc" ]; then
warn "failed to locate 'boot.wim' or 'boot.esd' in ISO image, $FB"
BOOT_MODE="windows_legacy" BOOT_MODE="windows_legacy"
return 1 warn "failed to locate 'boot.wim' or 'boot.esd' in ISO image, $FB" && return 1
fi fi
info "Adding XML file for automatic installation..." info "Adding XML file for automatic installation..."
@ -1037,8 +1071,7 @@ updateImage() {
fi fi
if ! wimlib-imagex update "$loc" "$index" --command "add $asset /autounattend.xml" > /dev/null; then if ! wimlib-imagex update "$loc" "$index" --command "add $asset /autounattend.xml" > /dev/null; then
warn "failed to add XML to ISO image, $FB" warn "failed to add XML to ISO image, $FB" && return 1
return 1
fi fi
return 0 return 0
@ -1047,6 +1080,7 @@ updateImage() {
buildImage() { buildImage() {
local dir="$1" local dir="$1"
local failed="N"
local cat="BOOT.CAT" local cat="BOOT.CAT"
local label="${BASE%.*}" local label="${BASE%.*}"
local log="/run/shm/iso.log" local log="/run/shm/iso.log"
@ -1056,8 +1090,7 @@ buildImage() {
local out="$TMP/$label.tmp" local out="$TMP/$label.tmp"
rm -f "$out" rm -f "$out"
desc=$(printVersion "$DETECTED") desc=$(printVersion "$DETECTED" "ISO")
[ -z "$desc" ] && desc="ISO"
local msg="Building $desc image..." local msg="Building $desc image..."
info "$msg" && html "$msg" info "$msg" && html "$msg"
@ -1068,16 +1101,14 @@ buildImage() {
space_gb=$(( (space + 1073741823)/1073741824 )) space_gb=$(( (space + 1073741823)/1073741824 ))
if (( size > space )); then if (( size > space )); then
error "Not enough free space in $STORAGE, have $space_gb GB available but need at least $size_gb GB." error "Not enough free space in $STORAGE, have $space_gb GB available but need at least $size_gb GB." && return 1
return 1
fi fi
if [[ "${BOOT_MODE,,}" != "windows_legacy" ]]; then if [[ "${BOOT_MODE,,}" != "windows_legacy" ]]; then
if ! genisoimage -o "$out" -b "$ETFS" -no-emul-boot -c "$cat" -iso-level 4 -J -l -D -N -joliet-long -relaxed-filenames -V "$label" \ if ! genisoimage -o "$out" -b "$ETFS" -no-emul-boot -c "$cat" -iso-level 4 -J -l -D -N -joliet-long -relaxed-filenames -V "$label" \
-udf -boot-info-table -eltorito-alt-boot -eltorito-boot "$EFISYS" -no-emul-boot -allow-limited-size -quiet "$dir" 2> "$log"; then -udf -boot-info-table -eltorito-alt-boot -eltorito-boot "$EFISYS" -no-emul-boot -allow-limited-size -quiet "$dir" 2> "$log"; then
[ -s "$log" ] && echo "$(<"$log")" failed="Y"
return 1
fi fi
else else
@ -1086,21 +1117,24 @@ buildImage() {
if ! genisoimage -o "$out" -b "$ETFS" -no-emul-boot -c "$cat" -iso-level 2 -J -l -D -N -joliet-long -relaxed-filenames -V "$label" \ if ! genisoimage -o "$out" -b "$ETFS" -no-emul-boot -c "$cat" -iso-level 2 -J -l -D -N -joliet-long -relaxed-filenames -V "$label" \
-udf -allow-limited-size -quiet "$dir" 2> "$log"; then -udf -allow-limited-size -quiet "$dir" 2> "$log"; then
[ -s "$log" ] && echo "$(<"$log")" failed="Y"
return 1
fi fi
else else
if ! genisoimage -o "$out" -b "$ETFS" -no-emul-boot -boot-load-seg 1984 -boot-load-size 4 -c "$cat" -iso-level 2 -J -l -D -N -joliet-long \ if ! genisoimage -o "$out" -b "$ETFS" -no-emul-boot -boot-load-seg 1984 -boot-load-size 4 -c "$cat" -iso-level 2 -J -l -D -N -joliet-long \
-relaxed-filenames -V "$label" -quiet "$dir" 2> "$log"; then -relaxed-filenames -V "$label" -quiet "$dir" 2> "$log"; then
[ -s "$log" ] && echo "$(<"$log")" failed="Y"
return 1
fi fi
fi fi
fi fi
if [[ "$failed" != "N" ]]; then
[ -s "$log" ] && echo "$(<"$log")"
error "Failed to build image!" && return 1
fi
local error="" local error=""
local hide="Warning: creating filesystem that does not conform to ISO-9660." local hide="Warning: creating filesystem that does not conform to ISO-9660."
@ -1108,8 +1142,7 @@ buildImage() {
[[ "$error" != "$hide" ]] && echo "$error" [[ "$error" != "$hide" ]] && echo "$error"
if [ -f "$STORAGE/$BASE" ]; then if [ -f "$STORAGE/$BASE" ]; then
error "File $STORAGE/$BASE does already exist?!" error "File $STORAGE/$BASE does already exist?!" && return 1
return 1
fi fi
mv "$out" "$STORAGE/$BASE" mv "$out" "$STORAGE/$BASE"
@ -1161,39 +1194,35 @@ bootWindows() {
###################################### ######################################
if ! startInstall; then if ! startInstall; then
if ! bootWindows; then bootWindows && return 0
error "Failed to boot Windows!" exit 68
exit 68
fi
return 0
fi fi
if [ ! -s "$ISO" ] || [ ! -f "$ISO" ]; then if [ ! -s "$ISO" ] || [ ! -f "$ISO" ]; then
rm -f "$ISO"
if ! downloadImage "$ISO" "$VERSION"; then if ! downloadImage "$ISO" "$VERSION"; then
error "Failed to download $VERSION" rm -f "$ISO"
exit 61 exit 61
fi fi
fi fi
if ! extractImage "$ISO" "$DIR"; then if ! extractImage "$ISO" "$DIR"; then
abortInstall "$ISO" rm -f "$ISO"
return 0 exit 62
fi fi
if ! detectImage "$DIR"; then if ! detectImage "$DIR"; then
abortInstall "$ISO" abortInstall "$ISO" && return 0
return 0 exit 60
fi fi
if ! prepareImage "$ISO" "$DIR"; then if ! prepareImage "$ISO" "$DIR"; then
abortInstall "$ISO" abortInstall "$ISO" && return 0
return 0 exit 60
fi fi
if ! updateImage "$ISO" "$DIR" "$XML"; then if ! updateImage "$ISO" "$DIR" "$XML"; then
abortInstall "$ISO" abortInstall "$ISO" && return 0
return 0 exit 60
fi fi
if ! rm -f "$ISO" 2> /dev/null; then if ! rm -f "$ISO" 2> /dev/null; then
@ -1203,12 +1232,10 @@ if ! rm -f "$ISO" 2> /dev/null; then
fi fi
if ! buildImage "$DIR"; then if ! buildImage "$DIR"; then
error "Failed to build image!"
exit 65 exit 65
fi fi
if ! finishInstall "$STORAGE/$BASE" "N"; then if ! finishInstall "$STORAGE/$BASE" "N"; then
error "Failed to finish installation!"
exit 69 exit 69
fi fi