1
0
Fork 0
mirror of https://github.com/JasonN3/build-container-installer.git synced 2025-12-25 10:57:55 +01:00

remove base_dir

This commit is contained in:
Jason N. 2024-04-02 15:37:46 -04:00
parent b7f04b0bf6
commit 49bd3da9c9
4 changed files with 18 additions and 18 deletions

View file

@ -1,7 +1,7 @@
input.txt: gen_input.sh
sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' ../results/boot/grub2/grub.cfg
sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' ../results/EFI/BOOT/grub.cfg
$(eval _VARS = ARCH _BASE_DIR FLATPAK_DIR IMAGE_NAME IMAGE_TAG ISO_NAME VERSION)
$(eval _VARS = ARCH FLATPAK_DIR IMAGE_NAME IMAGE_TAG ISO_NAME VERSION)
$(foreach var,$(_VARS),$(var)=$($(var))) bash gen_input.sh | tee input.txt
install-deps:

View file

@ -1,19 +1,19 @@
#!/bin/bash
echo "-report_about WARNING"
echo "-indev ${_BASE_DIR}/results/images/boot.iso"
echo "-indev ${PWD}/results/images/boot.iso"
echo "-outdev ${ISO_NAME}"
echo "-boot_image any replay"
echo "-joliet on"
echo "-compliance joliet_long_names"
#pushd ${_BASE_DIR}/results > /dev/null
#pushd ${PWD}/results > /dev/null
#for file in $(find * -type f)
#do
# if [[ "$file" == "images/boot.iso" ]]
# then
# continue
# fi
# echo "-map ${_BASE_DIR}/results/${file} ${file}"
# echo "-map ${PWD}/results/${file} ${file}"
# echo "-chmod 0444 ${file}"
#done
#popd > /dev/null
@ -35,7 +35,7 @@ then
echo "-chmod 0444 /sb_pubkey.der"
fi
pushd ${_BASE_DIR}/container > /dev/null
pushd ${PWD}/container > /dev/null
for file in $(find ${IMAGE_NAME}-${IMAGE_TAG} -type f)
do
echo "-map $(pwd)/${file} ${file}"