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

fix: Print version

Browse source
This commit is contained in:
Kroese 2024-04-24 17:00:02 +02:00 • committed by GitHub
parent c34f7dcfd3
commit 94c4163851
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/install.sh
View file

@ -113,7 +113,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"
@ -135,6 +135,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
} }
@ -142,7 +144,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"
@ -178,6 +180,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
} }
@ -455,13 +459,11 @@ downloadImage() {
if [[ "$EXTERNAL" != [Yy1]* ]]; then if [[ "$EXTERNAL" != [Yy1]* ]]; then
file="$iso.PART" file="$iso.PART"
desc=$(printVersion "$VERSION") desc=$(printVersion "$VERSION" "Windows")
[ -z "$desc" ] && desc="Windows"
else else
desc=$(getName "$BASE") desc=$(getName "$BASE" "$BASE")
[ -z "$desc" ] && desc="$BASE"
fi fi
@ -574,7 +576,7 @@ 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"
@ -664,8 +666,7 @@ extractImage() {
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..."
@ -720,8 +721,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
@ -770,8 +770,7 @@ detectImage() {
warn "failed to determine Windows version from string '$name', $FB" && return 0 warn "failed to determine Windows version from string '$name', $FB" && 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"
@ -1074,8 +1073,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"