From abb54cfcc2b22123d687968b172a7508d926d978 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 6 Jul 2024 21:51:19 +0200 Subject: [PATCH] Include uncommitted changes in archiso --- archiso/scripts/build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/archiso/scripts/build.sh b/archiso/scripts/build.sh index cf3e95d7..70f5c2e1 100755 --- a/archiso/scripts/build.sh +++ b/archiso/scripts/build.sh @@ -7,9 +7,16 @@ nixCache="$cacheRoot/nixpkgs"; root="airootfs"; rootHome="$overlayDir/$root/root"; profileDir="/mnt/archiso-valhalla"; +projectDir="$rootHome/PortValhalla"; nixDir="$profileDir/$root/nix/var/nix/profiles/per-user/root/channels/nixpkgs"; mkdir -p "$rootHome"; -git clone .. "$rootHome/PortValhalla"; +git clone .. "$projectDir"; +git -C .. diff HEAD | git -C "$projectDir" apply; + +git -C .. ls-files --exclude-standard --others | \ + while read file; do + cp "../$file" "$projectDir/$file"; + done; if [ ! -d "$nixCache" ]; then mkdir -p "$nixCache"