From ede397ed5b34164b583ed81158e5b49b8fdc1595 Mon Sep 17 00:00:00 2001 From: iximeow Date: Wed, 4 Nov 2015 23:59:52 -0800 Subject: use progressiflyiosh for status instead of ad-hoc --- build_helpers/splicetobootsect.sh | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'build_helpers/splicetobootsect.sh') diff --git a/build_helpers/splicetobootsect.sh b/build_helpers/splicetobootsect.sh index ac4ca0d..7a5b0b8 100755 --- a/build_helpers/splicetobootsect.sh +++ b/build_helpers/splicetobootsect.sh @@ -2,30 +2,34 @@ set -u set -e +. build_helpers/progressif.ly.io.sh + if [ -z "$1" ] || [ ! -f "$1" ]; then - echo "Argument must be the path to a binary to splice into a bootsector" + track err_argpath "Argument must be the path to a binary to splice into a bootsector" + trackend err_argpath f exit 1 fi INSIZE=$(stat -c%s $1) if [ $INSIZE -ge 510 ]; then - echo "Input file is greater than bootsector max size (510 bytes)" + track err_bootsectsize "Input file is greater than bootsector max size (510 bytes)" + trackend err_bootsectsize f exit 1 fi OUTFILE="bootable.img" -echo -n "[*] Creating bootsector template... " +track bootsect_template "Creating bootsector template... " dd if=/dev/zero bs=510 count=1 of="$OUTFILE" >/dev/null 2>&1 echo -ne "\x55\xaa" >> "$OUTFILE" dd if=/dev/zero bs=512 count=255 ibs=512 seek=1 of="$OUTFILE" >/dev/null 2>&1 -echo " OK!" +trackend bootsect_template t -echo -n "[*] Inserting bootsector... " +track create_bootsect "Inserting bootsector... " dd if="$1" of="$OUTFILE" conv=notrunc >/dev/null 2>&1 -echo " OK!" +trackend create_bootsect t -echo -n "[*] Inserting kernel... " +track insert_kernel "Inserting kernel... " dd if="bin/src._kernel._main.bin" of="$OUTFILE" conv=notrunc ibs=512 seek=1 >/dev/null 2>&1 -echo " OK!" -echo "Done. File at:" -echo "$OUTFILE" +trackend insert_kernel t +track splice_done "Done. File at: '$OUTFILE'" +trackend splice_done t -- cgit v1.1