mkefidisk.sh: Add signal handling

Add basic signal handling to unmount and remove any temporary files.
Correct a quoting issue with the die() function caught testing signal
handling.
Fix a minor typo in "formatting" output.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
index 28cfb6dd54da9ac9a99aa53ad831b7b1e0ca7b9b..b96b7d4f7da32298cb83cd4e5b450d2f90a25b27 100755 (executable)
--- a/scripts/contrib/mkefidisk.sh
+++ b/scripts/contrib/mkefidisk.sh
@@ -48,6 +48,8 @@ cleanup() {
        fi
 }
 
+trap 'die "Signal Received, Aborting..."' HUP INT TERM
+
 # Logging routines
 WARNINGS=0
 ERRORS=0
@@ -71,7 +73,7 @@ success() {
        echo "${GREEN}$1${CLEAR}"
 }
 die() {
-       error $1
+       error "$1"
        cleanup
        exit 1
 }
@@ -288,7 +290,7 @@ unmount_device || die "Failed to unmount $DEVICE partitions"
 #
 # Format $DEVICE partitions
 #
-info "Formating partitions"
+info "Formatting partitions"
 debug "Formatting $BOOTFS as vfat"
 if [ ! "${DEVICE#/dev/loop}" = "${DEVICE}" ]; then
        mkfs.vfat -I $BOOTFS -n "EFI" >$OUT 2>&1 || die "Failed to format $BOOTFS"