From 6393215e144ab3ae6164362957074d3e02e07090 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 14 Jun 2019 13:32:33 -0400 Subject: [PATCH] Move autogen'd files to artifacts dir --- .gitignore | 1 + buildiso.sh | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1e9b181..b061f8b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +artifacts/ debootstrap/ *.iso *.squashfs diff --git a/buildiso.sh b/buildiso.sh index 648cfb2..e50521c 100755 --- a/buildiso.sh +++ b/buildiso.sh @@ -108,14 +108,18 @@ build_iso() { popd &>/dev/null echo "done." - echo -n "Moving generated ISO to '$(pwd)/pvc-installer.iso'... " - mv ${tempdir}/pvc-installer.iso pvc-installer.iso &>/dev/null || fail "Error moving ISO file." + echo -n "Moving generated ISO to './pvc-installer.iso'... " + mv ${tempdir}/pvc-installer.iso ../pvc-installer.iso &>/dev/null || fail "Error moving ISO file." echo "done." } +pushd artifacts/ + prepare_iso prepare_rootfs build_iso cleanup +popd + echo "PVC Live Installer ISO generation complete."