sebarocks/docker-windows
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2025-10-29 20:25:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update install.sh

Browse source
This commit is contained in:
Kroese 2024-05-10 03:51:57 +02:00 • committed by GitHub
parent c2e00a054f
commit 8e238b370d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/install.sh
View file

@ -841,17 +841,6 @@ prepareImage() {
return 1 return 1
} }
isOurs() {
local asset="$1"
[ ! -f "$asset" ] && return 1
grep -q Dockur "$asset" && return 0
grep -q NetKVM "$asset" && return 0
return 1
}
updateImage() { updateImage() {
local dir="$1" local dir="$1"
@ -889,46 +878,51 @@ updateImage() {
index="2" index="2"
fi fi
if wimlib-imagex extract "$loc" "$index" "/$file" "--dest-dir=$TMP" >/dev/null 2>&1; then
if ! wimlib-imagex extract "$loc" "$index" "/${file/.xml/.dat}" "--dest-dir=$TMP" >/dev/null 2>&1; then
if ! wimlib-imagex extract "$loc" "$index" "/${file/.xml/.org}" "--dest-dir=$TMP" >/dev/null 2>&1; then
if ! wimlib-imagex update "$loc" "$index" --command "rename /$file /${file/.xml/.org}" > /dev/null; then
warn "failed to backup original answer file ($file)."
fi
fi
fi
rm -f "$TMP/$file"
rm -f "$TMP/${file/.xml/.dat}"
rm -f "$TMP/${file/.xml/.org}"
fi
if [[ "$MANUAL" != [Yy1]* ]]; then if [[ "$MANUAL" != [Yy1]* ]]; then
xml=$(basename "$asset") xml=$(basename "$asset")
info "Adding $xml for automatic installation..." info "Adding $xml for automatic installation..."
if wimlib-imagex extract "$loc" "$index" "/$file" "--dest-dir=$TMP" >/dev/null 2>&1; then
if [ -f "$TMP/$file" ] && ! isOurs "$TMP/$file"; then
if ! wimlib-imagex update "$loc" "$index" --command "rename /$file /$file.org" > /dev/null; then
warn "failed to rename answer file ($file) in ISO image."
fi
fi
rm -f "$TMP/$file"
fi
if ! wimlib-imagex update "$loc" "$index" --command "add $asset /$file" > /dev/null; then if ! wimlib-imagex update "$loc" "$index" --command "add $asset /$file" > /dev/null; then
MANUAL="Y" MANUAL="Y"
warn "failed to add answer file ($xml) to ISO image, $FB" warn "failed to add answer file ($xml) to ISO image, $FB"
else
wimlib-imagex update "$loc" "$index" --command "add $asset /${file/.xml/.dat}" > /dev/null || true
fi fi
fi fi
if [[ "$MANUAL" == [Yy1]* ]]; then if [[ "$MANUAL" == [Yy1]* ]]; then
if ! wimlib-imagex update "$loc" "$index" --command "delete --force /$file" > /dev/null; then wimlib-imagex update "$loc" "$index" --command "delete --force /$file" > /dev/null || true
warn "failed to remove answer file ($file) from ISO image!" if wimlib-imagex update "$loc" "$index" --command "rename /${file/.xml/.org} /$file" >/dev/null 2>&1; then
wimlib-imagex update "$loc" "$index" --command "delete --force /${file/.xml/.dat}" > /dev/null || true
fi fi
wimlib-imagex update "$loc" "$index" --command "rename /$file.org /$file" >/dev/null 2>&1 || true
fi fi
local find="$file" local find="$file"
[[ "$MANUAL" == [Yy1]* ]] && find="$find.org" [[ "$MANUAL" == [Yy1]* ]] && find="${file/.xml/.org}"
path=$(find "$dir" -maxdepth 1 -type f -iname "$find" | head -n 1) path=$(find "$dir" -maxdepth 1 -type f -iname "$find" | head -n 1)
if [ -f "$path" ]; then if [ -f "$path" ]; then
if [[ "$MANUAL" != [Yy1]* ]]; then if [[ "$MANUAL" != [Yy1]* ]]; then
mv -f "$path" "$path.org" mv -f "$path" "${path/.xml/.org}"
else else
mv -f "$path" "${path/.org/}" mv -f "$path" "${path/.org/.xml}"
fi fi
fi fi