From e8e1032027d646615a007bf48282c0f9bbf66520 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Tue, 9 Jul 2019 16:53:40 -0500 Subject: [PATCH] gpg_add_key_reflash: handle user cancellation if user chooses abort option, exit without flashing ROM Signed-off-by: Matt DeVillier --- initrd/bin/gpg-gui.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/initrd/bin/gpg-gui.sh b/initrd/bin/gpg-gui.sh index 6a752374..0b016b62 100755 --- a/initrd/bin/gpg-gui.sh +++ b/initrd/bin/gpg-gui.sh @@ -196,7 +196,12 @@ gpg_add_key_reflash() { find /media -name '*.key' > /tmp/filelist.txt find /media -name '*.asc' >> /tmp/filelist.txt file_selector "/tmp/filelist.txt" "Choose your GPG public key" - PUBKEY=$FILE + # bail if user didn't select a file + if [ "$FILE" = "" ]; then + return + else + PUBKEY=$FILE + fi /bin/flash.sh -r /tmp/gpg-gui.rom if [ ! -s /tmp/gpg-gui.rom ]; then