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

Update install.sh

Browse source
This commit is contained in:
Kroese 2024-01-22 19:46:01 +01:00 • committed by GitHub
parent 1d984e1e93
commit 22d1a91764
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/install.sh
View file

@ -106,23 +106,21 @@ if [ -f "$STORAGE/$BASE" ]; then
MAGIC=$(dd if="$STORAGE/$BASE" seek=0 bs=1 count=1 status=none | tr -d '\000') MAGIC=$(dd if="$STORAGE/$BASE" seek=0 bs=1 count=1 status=none | tr -d '\000')
MAGIC="$(printf '%s' "$MAGIC" | od -A n -t x1 -v | tr -d ' \n')" MAGIC="$(printf '%s' "$MAGIC" | od -A n -t x1 -v | tr -d ' \n')"
if [[ "$MAGIC" == "16" ]] || [[ "$MAGIC" == "17" ]] || [[ "$MAGIC" == "18" ]]; then if [[ "$MAGIC" == "16" ]] && [ -f "$STORAGE/windows.ver" ]; then
if [ -f "$STORAGE/windows.ver" ] && [ -f "$STORAGE/windows.base" ]; then
if [ -f "$STORAGE/data.img" ] || [ -f "$STORAGE/data.qcow2" ] DEVICDEE; then
if [ -f "$STORAGE/windows.mode" ]; then
LAST_MODE=$(<"$STORAGE/windows.mode") FOUND="N"
if [[ "${LAST_MODE,,}" == "${MANUAL,,}" ]]; then if [ -f "$STORAGE/data.img" ] || [ -f "$STORAGE/data.qcow2" ]; then
FOUND="Y"
rm -rf "$TMP" else
return 0 [ -b "${DEVICE:-}" ] && FOUND="Y"
fi
fi
fi
fi fi
if [[ "$FOUND" == "Y" ]]; then
rm -rf "$TMP"
return 0
fi
fi fi
EXTERNAL="Y" EXTERNAL="Y"
@ -217,10 +215,8 @@ if [ ! -f "$DIR/$ETFS" ] || [ ! -f "$DIR/$EFISYS" ]; then
[[ "$ISO" != "$STORAGE/$BASE" ]] && mv -f "$ISO" "$STORAGE/$BASE" [[ "$ISO" != "$STORAGE/$BASE" ]] && mv -f "$ISO" "$STORAGE/$BASE"
rm -f "$STORAGE/windows.ver" rm -f "$STORAGE/windows.ver"
rm -f "$STORAGE/windows.xml"
cp /run/version "$STORAGE/windows.ver" cp /run/version "$STORAGE/windows.ver"
echo "$BASE" > "$STORAGE/windows.base"
echo "$MANUAL" > "$STORAGE/windows.mode"
rm -rf "$TMP" rm -rf "$TMP"
return 0 return 0
fi fi
@ -367,13 +363,7 @@ genisoimage -b "$ETFS" -no-emul-boot -c "$CAT" -iso-level 4 -J -l -D -N -joliet-
-boot-info-table -eltorito-alt-boot -eltorito-boot "$EFISYS" -no-emul-boot -o "$OUT" -allow-limited-size "$DIR" -boot-info-table -eltorito-alt-boot -eltorito-boot "$EFISYS" -no-emul-boot -o "$OUT" -allow-limited-size "$DIR"
# Mark ISO as prepared via magic byte # Mark ISO as prepared via magic byte
if [ ! -f "$ASSET" ]; then printf '\x16' | dd of=$ISO bs=1 seek=0 count=1 conv=notrunc status=none
BYTE="\x17"
else
BYTE="\x18"
fi
printf "$BYTE" | dd of=$OUT bs=1 seek=0 count=1 conv=notrunc status=none
[ -n "$CUSTOM" ] && rm -f "$STORAGE/$CUSTOM" [ -n "$CUSTOM" ] && rm -f "$STORAGE/$CUSTOM"
@ -384,14 +374,7 @@ fi
mv "$OUT" "$STORAGE/$BASE" mv "$OUT" "$STORAGE/$BASE"
rm -f "$STORAGE/windows.ver" rm -f "$STORAGE/windows.ver"
rm -f "$STORAGE/windows.xml"
cp /run/version "$STORAGE/windows.ver" cp /run/version "$STORAGE/windows.ver"
echo "$BASE" > "$STORAGE/windows.base"
echo "$MANUAL" > "$STORAGE/windows.mode"
if [ -f "$ASSET" ]; then
cp "$ASSET" "$STORAGE/windows.xml"
fi
rm -rf "$TMP" rm -rf "$TMP"