Merge pull request #1372 from JonathonHall-Purism/fix-benign-script-errors

Fix benign script errors

Author: tlaurion

initrd/bin/kexec-select-boot

@@ -292,8 +292,8 @@ user_select() {
 
 	if [ "$option_confirm" = "d" ]; then
 		if [ ! -r "$TMP_KEY_DEVICES" ]; then
-			# rerun primary boot loop to boot the new default option
-			continue
+			# continue below to boot the new default option
+			true
 		else
 			echo "+++ Rebooting to start the new default option"
 			sleep 2

initrd/bin/mount-usb

@@ -23,7 +23,7 @@ if [ ! -d /media ]; then
 fi
 
 list_usb_storage > /tmp/usb_block_devices
-if [ -z `cat /tmp/usb_block_devices` ]; then
+if [ -z "$(cat /tmp/usb_block_devices)" ]; then
   if [ -x /bin/whiptail ]; then
     whiptail $BG_COLOR --title 'USB Drive Missing' \
       --msgbox "Insert your USB drive and press Enter to continue." 16 60
@@ -33,7 +33,7 @@ if [ -z `cat /tmp/usb_block_devices` ]; then
   fi
   sleep 1
   list_usb_storage > /tmp/usb_block_devices
-  if [ -z `cat /tmp/usb_block_devices` ]; then
+  if [ -z "$(cat /tmp/usb_block_devices)" ]; then
     if [ -x /bin/whiptail ]; then
       whiptail $BG_COLOR_ERROR --title 'ERROR: USB Drive Missing' \
         --msgbox "USB Drive Missing! Aborting mount attempt.\n\nPress Enter to continue." 16 60