zishuo/windows
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2025-09-26 19:41:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Check image count in ESD file (#1391)

Browse Source
This commit is contained in:
Kroese
2025-09-15 02:09:31 +02:00
committed by GitHub
parent e3dc889601
commit 1ebb4c8d58
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/install.sh
View File

@@ -301,7 +301,11 @@ extractESD() {
fi
local esdImageCount
esdImageCount=$(wimlib-imagex info "$iso" | awk '/Image Count:/ {print $3}')
esdImageCount=$(wimlib-imagex info "$iso" | iconv -f UTF-16LE -t UTF-8 | awk '/Image Count:/ {print $3}')
if [ -z "$esdImageCount" ]; then
error "Cannot read the image count in ESD file!" && return 1
fi
wimlib-imagex apply "$iso" 1 "$dir" --quiet 2>/dev/null || {
retVal=$?
@@ -344,7 +348,7 @@ extractESD() {
fi
for (( imageIndex=4; imageIndex<=esdImageCount; imageIndex++ )); do
imageEdition=$(wimlib-imagex info "$iso" ${imageIndex} | grep '^Description:' | sed 's/Description:[ \t]*//')
imageEdition=$(wimlib-imagex info "$iso" ${imageIndex} | iconv -f UTF-16LE -t UTF-8 | grep '^Description:' | sed 's/Description:[ \t]*//')
[[ "${imageEdition,,}" != "${edition,,}" ]] && continue
wimlib-imagex export "$iso" ${imageIndex} "$installWimFile" --compress=LZMS --chunk-size 128K --quiet || {
retVal=$?
@@ -917,7 +921,7 @@ updateImage() {
fi
index="1"
result=$(wimlib-imagex info -xml "$wim" | tr -d '\000')
result=$(wimlib-imagex info -xml "$wim" | iconv -f UTF-16LE -t UTF-8)
if [[ "${result^^}" == *"<IMAGE INDEX=\"2\">"* ]]; then
index="2"