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 install.sh

Browse source
This commit is contained in:
Kroese 2024-01-26 18:37:55 +01:00 • committed by GitHub
parent 72acddfc45
commit f27c5f8ae7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/install.sh
View file

@ -2,6 +2,7 @@
set -Eeuo pipefail set -Eeuo pipefail
: "${MANUAL:=""}" : "${MANUAL:=""}"
: "${DETECTED:=""}"
: "${VERSION:="win11x64"}" : "${VERSION:="win11x64"}"
if [[ "${VERSION}" == \"*\" || "${VERSION}" == \'*\' ]]; then if [[ "${VERSION}" == \"*\" || "${VERSION}" == \'*\' ]]; then
@ -23,6 +24,12 @@ fi
[[ "${VERSION,,}" == "7" ]] && VERSION="win7x64" [[ "${VERSION,,}" == "7" ]] && VERSION="win7x64"
[[ "${VERSION,,}" == "win7" ]] && VERSION="win7x64" [[ "${VERSION,,}" == "win7" ]] && VERSION="win7x64"
[[ "${VERSION,,}" == "vista" ]] && VERSION="winvistax64"
[[ "${VERSION,,}" == "winvista" ]] && VERSION="winvistax64"
[[ "${VERSION,,}" == "xp" ]] && VERSION="winxpx64"
[[ "${VERSION,,}" == "winxp" ]] && VERSION="winxpx64"
[[ "${VERSION,,}" == "22" ]] && VERSION="win2022-eval" [[ "${VERSION,,}" == "22" ]] && VERSION="win2022-eval"
[[ "${VERSION,,}" == "2022" ]] && VERSION="win2022-eval" [[ "${VERSION,,}" == "2022" ]] && VERSION="win2022-eval"
[[ "${VERSION,,}" == "win22" ]] && VERSION="win2022-eval" [[ "${VERSION,,}" == "win22" ]] && VERSION="win2022-eval"
@ -44,25 +51,28 @@ fi
[[ "${VERSION,,}" == "win10x64-ltsc" ]] && VERSION="win10x64-enterprise-ltsc-eval" [[ "${VERSION,,}" == "win10x64-ltsc" ]] && VERSION="win10x64-enterprise-ltsc-eval"
if [[ "${VERSION,,}" == "tiny11" ]]; then if [[ "${VERSION,,}" == "tiny11" ]]; then
DETECTED="win11x64"
VERSION="https://archive.org/download/tiny-11-core-x-64-beta-1/tiny11%20core%20x64%20beta%201.iso" VERSION="https://archive.org/download/tiny-11-core-x-64-beta-1/tiny11%20core%20x64%20beta%201.iso"
fi fi
if [[ "${VERSION,,}" == "tiny10" ]]; then if [[ "${VERSION,,}" == "tiny10" ]]; then
DETECTED="win10x64-enterprise-ltsc-eval"
VERSION="https://archive.org/download/tiny-10-23-h2/tiny10%20x64%2023h2.iso" VERSION="https://archive.org/download/tiny-10-23-h2/tiny10%20x64%2023h2.iso"
fi fi
if [[ "${VERSION,,}" == "win7x64" ]]; then if [[ "${VERSION,,}" == "win7x64" ]]; then
DETECTED="win7x64"
VERSION="https://dl.bobpony.com/windows/7/en_windows_7_with_sp1_x64.iso" VERSION="https://dl.bobpony.com/windows/7/en_windows_7_with_sp1_x64.iso"
fi fi
if [[ "${VERSION,,}" == "vista" ]]; then if [[ "${VERSION,,}" == "winvistax64" ]]; then
MANUAL="Y" DETECTED="winvistax64"
BOOT_MODE="windows_legacy" BOOT_MODE="windows_legacy"
VERSION="https://dl.bobpony.com/windows/vista/en_windows_vista_sp2_x64_dvd_342267.iso" VERSION="https://dl.bobpony.com/windows/vista/en_windows_vista_sp2_x64_dvd_342267.iso"
fi fi
if [[ "${VERSION,,}" == "xp" ]]; then if [[ "${VERSION,,}" == "winxpx64" ]]; then
MANUAL="Y" DETECTED="winxpx64"
BOOT_MODE="windows_legacy" BOOT_MODE="windows_legacy"
VERSION="https://dl.bobpony.com/windows/xp/professional/en_win_xp_pro_x64_vl.iso" VERSION="https://dl.bobpony.com/windows/xp/professional/en_win_xp_pro_x64_vl.iso"
fi fi
@ -321,7 +331,6 @@ extractImage() {
fi fi
BOOT_MODE="windows_legacy" BOOT_MODE="windows_legacy"
return 1
fi fi
return 0 return 0
@ -338,6 +347,8 @@ findVersion() {
[[ "${name,,}" == *"server 2019"* ]] && detected="win2019-eval" [[ "${name,,}" == *"server 2019"* ]] && detected="win2019-eval"
[[ "${name,,}" == *"server 2016"* ]] && detected="win2016-eval" [[ "${name,,}" == *"server 2016"* ]] && detected="win2016-eval"
[[ "${name,,}" == *"windows 7"* ]] && detected="win7x64" [[ "${name,,}" == *"windows 7"* ]] && detected="win7x64"
[[ "${name,,}" == *"windows vista"* ]] && detected="winvistax64"
[[ "${name,,}" == *"windows xp"* ]] && detected="winxpx64"
if [[ "${name,,}" == *"windows 10"* ]]; then if [[ "${name,,}" == *"windows 10"* ]]; then
if [[ "${name,,}" == *"enterprise ltsc"* ]]; then if [[ "${name,,}" == *"enterprise ltsc"* ]]; then
@ -354,24 +365,31 @@ findVersion() {
detectImage() { detectImage() {
local dir="$1" local dir="$1"
local try=""
local tag result name name2 local tag result name name2
XML="" XML=""
DETECTED=""
if [[ "$EXTERNAL" != [Yy1]* ]] && [ -z "$CUSTOM" ]; then if [ -n "$DETECTED" ]; then
if [[ "${VERSION,,}" != "win10x64-enterprise-ltsc-eval" ]]; then try="y"
DETECTED="$VERSION" else
else if [[ "$EXTERNAL" != [Yy1]* ]] && [ -z "$CUSTOM" ]; then
DETECTED="win10x64-ltsc" if [[ "${VERSION,,}" != "win10x64-enterprise-ltsc-eval" ]]; then
DETECTED="$VERSION"
else
DETECTED="win10x64-ltsc"
fi
try="y"
fi fi
fi
if [[ "$try" == "y" ]]; then
[[ "$MANUAL" == [Yy1]* ]] && return 0 [[ "$MANUAL" == [Yy1]* ]] && return 0
if [ -f "/run/assets/$DETECTED.xml" ]; then if [ -f "/run/assets/$DETECTED.xml" ]; then
XML="$DETECTED.xml" XML="$DETECTED.xml"
return 0 return 0
else
warn "image type is '$DETECTED', but no matching XML file exists!"
fi fi
warn "image type is '$DETECTED', but no matching XML file exists!"
fi fi
info "Detecting Windows version from ISO image..." info "Detecting Windows version from ISO image..."
@ -424,8 +442,10 @@ prepareImage() {
local iso="$1" local iso="$1"
local dir="$2" local dir="$2"
[[ "${DETECTED,,}" != "win7x64"* ]] && return 0 if [[ "${DETECTED,,}" != "win7x64"* ]] && [[ "${DETECTED,,}" != "winvistax64"* ]] && [[ "${DETECTED,,}" != "winxpx64"* ]]; then
return 0
fi
ETFS="boot.img" ETFS="boot.img"
BOOT_MODE="windows_legacy" BOOT_MODE="windows_legacy"