Compare commits

...

3 Commits

Author SHA1 Message Date
mauxadoor
21eb802bf4
Merge 57ac15b62d into 0b7e8f01be 2025-09-04 14:51:14 +08:00
renovate[bot]
0b7e8f01be
chore(deps): update hadolint/hadolint-action action to v3.2.0 (#1365)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-09-03 16:42:46 +02:00
StephanP
57ac15b62d wimlib-imagex info returns UTF-16LE but is interpreted as UTF8 2025-07-03 17:35:44 +02:00
2 changed files with 4 additions and 2 deletions

View File

@ -18,7 +18,7 @@ jobs:
path: "assets" path: "assets"
file-endings: ".xml" file-endings: ".xml"
- name: Lint Dockerfile - name: Lint Dockerfile
uses: hadolint/hadolint-action@v3.1.0 uses: hadolint/hadolint-action@v3.2.0
with: with:
dockerfile: Dockerfile dockerfile: Dockerfile
ignore: DL3006,DL3008 ignore: DL3006,DL3008

View File

@ -615,7 +615,9 @@ detectImage() {
warn "failed to locate 'install.wim' or 'install.esd' in ISO image, $FB" && return 1 warn "failed to locate 'install.wim' or 'install.esd' in ISO image, $FB" && return 1
fi fi
info=$(wimlib-imagex info -xml "$wim" | tr -d '\000') wimlib-imagex info -xml "$wim" > wimxml.xml
iconv -f UTF-16LE -t UTF-8 wimxml.xml -o wimxmlutf8.xml
info=$(cat wimxmlutf8.xml)
checkPlatform "$info" || exit 67 checkPlatform "$info" || exit 67
DETECTED=$(detectVersion "$info") DETECTED=$(detectVersion "$info")