diff --git a/run-windows11.py b/run-windows11.py index f3a1e1c..9b06ba2 100755 --- a/run-windows11.py +++ b/run-windows11.py @@ -250,8 +250,9 @@ if installing_from_iso: if not tools_iso.is_file(): die(f"downloader did not create: {tools_iso}") - seed_sources = [script_dir / "seediso" / "windows11" / name - for name in ("Autounattend.xml", "Configure-Windows.ps1")] + seed_dir = script_dir / "seediso" / "windows11" + seed_sources = [seed_dir / "Autounattend.xml", seed_dir / "Configure-Windows.ps1", + *sorted(seed_dir.glob("[0-9][0-9]-*.bat"))] def newer_than_seed(source): # Mirrors bash `-nt`: true if source exists and is newer than seed_iso. diff --git a/seediso/windows11/build-seed.sh b/seediso/windows11/build-seed.sh index ad5e929..0f932ad 100755 --- a/seediso/windows11/build-seed.sh +++ b/seediso/windows11/build-seed.sh @@ -7,6 +7,10 @@ seed_files=( "$script_dir/Autounattend.xml" "$script_dir/Configure-Windows.ps1" ) +# Numbered installer scripts (10-Install-Git.bat, 20-..., in install order). +shopt -s nullglob +seed_files+=("$script_dir"/[0-9][0-9]-*.bat) +shopt -u nullglob mkdir -p "$(dirname -- "$output")" if command -v xorriso >/dev/null 2>&1; then