From 72cae559d7689223528cab8da5d0c18ec92856b1 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 5 Jun 2023 13:34:02 +0200
Subject: [PATCH] firmware: refactor for clarity

---
 src/opnsense/scripts/firmware/upgrade.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/opnsense/scripts/firmware/upgrade.sh b/src/opnsense/scripts/firmware/upgrade.sh
index 8ad3386b8..0f120ce54 100755
--- a/src/opnsense/scripts/firmware/upgrade.sh
+++ b/src/opnsense/scripts/firmware/upgrade.sh
@@ -39,14 +39,14 @@ echo "Currently running $(opnsense-version) at $(date)" >> ${LOCKFILE}
 ${TEE} ${LOCKFILE} < ${PIPEFILE} &
 if opnsense-update -u > ${PIPEFILE} 2>&1; then
 	${TEE} ${LOCKFILE} < ${PIPEFILE} &
-	if ! /usr/local/etc/rc.syshook upgrade > ${PIPEFILE} 2>&1; then
-		# aboort pending upgrades
-		opnsense-update -e >> ${LOCKFILE} 2>&1
-	else
+	if /usr/local/etc/rc.syshook upgrade > ${PIPEFILE} 2>&1; then
 		echo '***REBOOT***' >> ${LOCKFILE}
 		sleep 5
 		/usr/local/etc/rc.reboot
 	fi
+
+	# aboort pending upgrades
+	opnsense-update -e >> ${LOCKFILE} 2>&1
 fi
 
 echo '***DONE***' >> ${LOCKFILE}