schiwagoa/windows
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Shellcheck (#173)

Browse Source
This commit is contained in:
Kroese 2024-02-16 14:43:03 +01:00 committed by GitHub
parent 8c148ebbf1
commit 41bab9d16d
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

@ -651,7 +651,8 @@ detectImage() {
return 0 return 0
fi fi
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"
@ -659,8 +660,7 @@ detectImage() {
return 1 return 1
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
@ -892,14 +892,14 @@ 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"
@ -907,7 +907,7 @@ updateImage() {
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