diff --git a/.linux_items/build_additions.txt b/.linux_items/build_additions.txt new file mode 100644 index 00000000..1a5acc8e --- /dev/null +++ b/.linux_items/build_additions.txt @@ -0,0 +1,5 @@ +rsync -aI "${script_path}/wklive/" "${work_dir}/iso/wklive/" +rm "${work_dir}/iso/EFI" -R +rm "${work_dir}/iso/loader" -R +rsync -aI "${script_path}/EFI/" "${work_dir}/iso/EFI/" + diff --git a/Build Linux b/Build Linux index fbafb99e..b451b16b 100755 --- a/Build Linux +++ b/Build Linux @@ -137,8 +137,9 @@ function update_live_env() { 7z e "$TEMP_DIR/wimboot.zip" -o"$LIVE_DIR/wklive/boot" 'wimboot*/LICENSE.txt' 'wimboot*/README.txt' 'wimboot*/wimboot' # build.sh - if ! grep -iq 'customize_iso' "$LIVE_DIR/build.sh"; then - sed -i -r 's!run_once make_iso$!# customize_iso\nrsync -aI "${script_path}/wklive/" "${work_dir}/iso/wklive/"\n\nrun_once make_iso!' "$LIVE_DIR/build.sh" + if ! grep -iq 'wklive additions' "$LIVE_DIR/build.sh"; then + sed -i -r 's/^(run_once make_iso)$/# wklive additions\n\1/' "$LIVE_DIR/build.sh" + sed -i '/# wklive additions/r .linux_items/build_additions.txt' "$LIVE_DIR/build.sh" fi # Hostname