diff --git a/.gitignore b/.gitignore index 72aa711..df805b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ /debugdata /build /flatpaks/script.sh +/flatpaks/repo +/flatpaks/list.txt /lorax_templates/post_* /pkglists /repos/*.repo diff --git a/flatpaks/Makefile b/flatpaks/Makefile index 2eff538..0e7ccb2 100644 --- a/flatpaks/Makefile +++ b/flatpaks/Makefile @@ -1,5 +1,5 @@ IMAGE := $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) -FLATPAK_DIR := $(if $(GITHUB_WORKSPACE),$(shell mktemp -d -p $(GITHUB_WORKSPACE) flatpak.XXX),$(PWD)) +FLATPAK_DIR := $(if $(GITHUB_WORKSPACE),$(shell mktemp -d -p $(GITHUB_WORKSPACE) flatpak.XXX),$(PWD)/flatpaks) .PHONY: full_list full_list: repo @@ -35,5 +35,8 @@ script.sh: install-deps: clean: + $(if $(wildcard script.sh),rm script.sh) + $(if $(wildcard repo),rm -Rf repo) + $(if $(wildcard list.txt),rm list.txt) .ONESHELL: \ No newline at end of file diff --git a/xorriso/gen_input.sh b/xorriso/gen_input.sh index 5520c7a..90e661c 100644 --- a/xorriso/gen_input.sh +++ b/xorriso/gen_input.sh @@ -7,7 +7,7 @@ echo "-boot_image any replay" echo "-joliet on" echo "-compliance joliet_long_names" pushd "${PWD}/../results" > /dev/null -#for file in $(find . -type f) +#for file in $(find .) for file in ./boot/grub2/grub.cfg ./EFI/BOOT/grub.cfg do if [[ "$file" == "./images/boot.iso" ]] @@ -22,7 +22,7 @@ popd > /dev/null if [[ -n "${FLATPAK_DIR}" ]] then pushd "${FLATPAK_DIR}" > /dev/null - for file in $(find repo -type f) + for file in $(find repo) do echo "-map ${PWD}/${file} flatpak/${file}" echo "-chmod 0444 flatpak/${file}"