Fabio/windows-arm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update install.sh

Browse source
This commit is contained in:
Kroese 2024-02-16 14:45:15 +01:00 committed by GitHub
parent 2eeff70fc6
commit 083ad0b2e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/install.sh
View file

@ -484,15 +484,15 @@ detectImage() {
info "Detecting Windows version from ISO image..." info "Detecting Windows version from ISO image..."
local src=$(find "$dir" -maxdepth 1 -type d -iname sources | head -n 1) local src loc tag result name name2 desc
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" warn "failed to locate 'sources' folder in ISO image, $FB"
return 0 return 0
fi fi
local tag result name name2 desc loc=$(find "$src" -maxdepth 1 -type f -iname install.wim | head -n 1)
local 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
@ -555,21 +555,21 @@ updateImage() {
local iso="$1" local iso="$1"
local dir="$2" local dir="$2"
local asset="/run/assets/$3" local asset="/run/assets/$3"
local index result local path src loc index result
[ ! -f "$asset" ] && return 0 [ ! -f "$asset" ] && return 0
local path=$(find "$dir" -maxdepth 1 -type f -iname autounattend.xml | head -n 1) path=$(find "$dir" -maxdepth 1 -type f -iname autounattend.xml | head -n 1)
[ -n "$path" ] && cp "$asset" "$path" [ -n "$path" ] && cp "$asset" "$path"
local 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" warn "failed to locate 'sources' folder in ISO image, $FB"
return 1 return 1
fi fi
local 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