From cd127e832021838d3f18ab63993e4135ca582023 Mon Sep 17 00:00:00 2001 From: Noah Huppert Date: Thu, 28 Mar 2019 20:43:36 -0400 Subject: [PATCH] mklive: fixed -o option so it could take an absolute path Closes: #56 [via git-merge-pr] --- mklive.sh.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mklive.sh.in b/mklive.sh.in index c568e45..4dfd36a 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -287,7 +287,7 @@ generate_iso_image() { -no-emul-boot -boot-load-size 4 -boot-info-table \ -eltorito-alt-boot -e boot/grub/efiboot.img -isohybrid-gpt-basdat -no-emul-boot \ -isohybrid-mbr "$SYSLINUX_DATADIR"/isohdpfx.bin \ - -output "$CURDIR/$OUTPUT_FILE" "$IMAGEDIR" || die "Failed to generate ISO image" + -output "$OUTPUT_FILE" "$IMAGEDIR" || die "Failed to generate ISO image" } # @@ -340,9 +340,6 @@ if [ "$(id -u)" -ne 0 ]; then die "Must be run as root, exiting..." fi -readonly CURDIR="$PWD" - - if [ -n "$ROOTDIR" ]; then BUILDDIR=$(mktemp --tmpdir="$ROOTDIR" -d) else @@ -417,7 +414,7 @@ generate_squashfs print_step "Generating ISO image..." generate_iso_image -hsize=$(du -sh "$CURDIR/$OUTPUT_FILE"|awk '{print $1}') -info_msg "Created $(readlink -f "$CURDIR"/"$OUTPUT_FILE") ($hsize) successfully." +hsize=$(du -sh "$OUTPUT_FILE"|awk '{print $1}') +info_msg "Created $(readlink -f "$OUTPUT_FILE") ($hsize) successfully."